On 08/15/2012 03:57 PM, Slávek Banko wrote:
> On Wednesday 15 of August 2012 22:10:12 David C. Rankin wrote:
>> All,
>>
>>   I have my abakus GIT tree messed up:
>>
>> 15:04 providence:/mnt/pv/home/david/tde13/tde/main/applications/abakus> git
>> checkout -f v3.5.13-sru
>> Already on 'v3.5.13-sru'
>> Your branch and 'origin/v3.5.13-sru' have diverged,
>> and have 66 and 11 different commits each, respectively.
>> 15:04 providence:/mnt/pv/home/david/tde13/tde/main/applications/abakus> git
>> pull U       admin
>> U       cmake
>> U       src/CMakeLists.txt
>> Pull is not possible because you have unmerged files.
>> Please, fix them up in the work tree, and then use 'git add/rm <file>'
>> as appropriate to mark resolution, or use 'git commit -a'.
>>
>>   How in the heck do I fix this? I've googled, I've 'git checkout --
>> src/CMakeLists.txt', I've git status, I've git diffed, but I can just tell
>> it to throw away all the stuff I have in abakus and just download a fresh
>> copy of origin/v3.5.13-sru
>>
>> What is the trick?
> 
> Your local branch is based on a different basis. The simplest is probably to 
> remove the local branch and go to the remote branch. Try:
> 
>   git branch -D v3.5.13-sru
> 
> To eliminate any local changes you can use:
> 
>   git stash save && git stash drop
> 
> Slavek
> 

I think I fixed it:

vi src/CMakeLists.txt
git add src/CMakeLists.txt
git add admin
git add cmake
git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
git commit -a
git pull
Already up-to-date.

I hope this didn't screw anything else up. But at least git pull works!



-- 
David C. Rankin, J.D.,P.E.