Bogdan Alecu wrote:
git checkout -b testing remotes/origin/sylvain/testing
you say to
fix merge content.
I'm not sure the above is quite the right git command, but I could
also be mistaken.
In any case, after git checkout it should never be neccessary to do a
merge, so I think something is not right about your use of git.
I usually recommend the book at
http://progit.org for learning Git.
//Peter