octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Can't update gui branch: git error


From: marco atzeri
Subject: Re: Can't update gui branch: git error
Date: Sun, 17 Jun 2012 10:10:41 +0200
User-agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:13.0) Gecko/20120604 Thunderbird/13.0

On 6/16/2012 11:00 PM, Ben Abbott wrote:
On Jun 16, 2012, at 1:36 PM, Michael Goffioul wrote:

Just tried to update my gui branch and got this git error:

getting .hgsubstate
pulling subrepo gui/qterminal from https://code.google.com/p/qterminal/
remote: Counting objects: 11, done.
remote: Finding sources: 100% (11/11), done.
remote: Total 11 (delta 3)
Unpacking objects: 100% (11/11), done.
 From https://code.google.com/p/qterminal
    6ae5b4e..9d13275  master     -> origin/master
fatal: A branch named 'origin/master' already exists.
abort: git checkout error 128 in gui/qterminal

I guess I could wipe out my local repo of qterminal, but anyone has an idea 
what's going on?

Michael.

I'm not seeing this.

Ben


I saw it regularly. My workaround

cd gui/qterminal
git pull

then next octave update
does not complain anymore

Marco


reply via email to

[Prev in Thread] Current Thread [Next in Thread]