[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging stable-2.0 into master

From: Mark H Weaver
Subject: Re: Merging stable-2.0 into master
Date: Sat, 03 Nov 2012 03:25:48 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux)

address@hidden (Ludovic Courtès) writes:
> Mark H Weaver <address@hidden> skribis:
>> I went ahead and pushed a proper merge of stable-2.0 into master.
> Great, thanks!  Which method did you use?

I used the more elaborate method described in my earlier email, so the
git history looks like the merges that wingo has been doing.  In other
words, I pushed only one new commit to the master branch, namely the one
produced by "git merge origin/stable-2.0".  However, to resolve the
merge conflicts I simply copied the files from the end result of my
earlier one-commit-at-a-time approach.

I saved a copy of the stable-2.0 patches adapted to master (as output by
"git format-patch") which produce precisely the same result as my merge
commit.  If you like, I can make them available.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]