git problems/question

Christian Groessler chris@groessler.org
Fri Sep 30 10:15:00 GMT 2016


Thanks for the hints so far.

But still I'm wondering:

Shouldn't the merge go smoothly if I merge from binutils-2_23-branchpoint?
In my understanding binutils-2_23-branchpoint is a tag on master where 
2.23 branched off.
Still I'm getting many conflicts:

$ git checkout -b test-branch binutils-2_23-branchpoint
$ git merge binutils-2_27


Was 2.23 still on cvs and this is some fallout from the transition to git?

regards,
chris



More information about the Binutils mailing list