This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: git problems/question
On Sep 30 2016, Christian Groessler <chris@groessler.org> wrote:
> 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?
Yes, this due to the way branches were cut in the CVS days and how
cvs2git tried to repreduce that very closely, by creating a commit that
deletes every file not part of binutils-2_23-branch in CVS. Nowadays, a
branch contains all files from the combined repository, even those not
part of binutils. Thus you will get modify/delete conflicts for all
those files that were deleted in the commit pointed to by
binutils-2_23-branchpoint. To avoid that start with the parent of
binutils-2_23-branchpoint.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."