From: Mark H Weaver <mhw@netris.org>
To: ludo@gnu.org (Ludovic Courtès)
Cc: guile-devel@gnu.org
Subject: Re: Merging stable-2.0 into master
Date: Sat, 03 Nov 2012 03:25:48 -0400 [thread overview]
Message-ID: <87a9uzi1vn.fsf@tines.lan> (raw)
In-Reply-To: <87vcdnmze8.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 02 Nov 2012 23:08:15 +0100")
ludo@gnu.org (Ludovic Courtès) writes:
> Mark H Weaver <mhw@netris.org> 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.
Mark
next prev parent reply other threads:[~2012-11-03 7:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 20:21 Merging stable-2.0 into master Mark H Weaver
2012-10-31 2:06 ` nalaginrut
2012-10-31 3:48 ` Mark H Weaver
2012-11-02 22:08 ` Ludovic Courtès
2012-11-03 7:25 ` Mark H Weaver [this message]
2012-11-03 14:10 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a9uzi1vn.fsf@tines.lan \
--to=mhw@netris.org \
--cc=guile-devel@gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).