This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: git problems/question
- From: Christian Groessler <chris at groessler dot org>
- To: "binutils at sourceware dot org" <binutils at sourceware dot org>
- Date: Fri, 30 Sep 2016 12:14:58 +0200
- Subject: Re: git problems/question
- Authentication-results: sourceware.org; auth=none
- References: <04a1f4a4-f754-9087-5444-7f2bb193d3f9@groessler.org>
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