[nama] Can't switch to dev branch (even though repo newly cloned)
- From: Julien Claassen <julien@xxxxxxxxxxx>
- To: Nama user's mailinglist <nama@xxxxxxxxxxxxx>
- Date: Thu, 24 May 2012 20:11:51 +0200 (CEST)
Hi everyone!
did anyone else experience that (Massy?):
git pull origin dev
[lots of merging and then conflicts]
CONFLICT (content): Merge conflict in src/IO.p
CONFLICT (add/add): Merge conflict in src/mt
Automatic merge failed; fix conflicts and then commit the result.
I'm sure, tat the problems are small, can you either fix it or is there a
way to quickly see the offending lines or get a suggestion, what might be
done?
Warm regards
Julien
=-=-=-=-=-=-=-=-=-=-=-=-
Such Is Life: Very Intensely Adorable;
Free And Jubilating Amazement Revels, Dancing On - FLOWERS!
====== Find my music at ======
http://juliencoder.de/nama/music.html
.....................................
"If you live to be 100, I hope I live to be 100 minus 1 day,
so I never have to live without you." (Winnie the Pooh)
Other related posts:
