From: William Morgan <wmorgan-git@masanjin.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: question about conflict resolution across multiple branches
Date: Sun, 22 Mar 2009 13:05:34 -0700 [thread overview]
Message-ID: <1237751617-sup-640@entry> (raw)
In-Reply-To: <7viqm58e8r.fsf@gitster.siamese.dyndns.org>
Reformatted excerpts from Junio C Hamano's message of 2009-03-19:
> $ git diff origin/next >fixup.patch
Ok, this is helpful. So git diff will give me an explicit dump of the
conflict resolution changes, which I can use with git apply --index when
I see the conflict. Sort of a manual, shared, git-rerere.
Wouldn't it be simpler for git format-patch to produce something for a
merge commit with conflicts? (Maybe there's a way and I just can't find
it?)
> Needless to say, you need to be careful when accepting such a fixup
> patch.
More careful than when accepting a "regular" patch?
Thanks for your help!
--
William <wmorgan-git@masanjin.net>
prev parent reply other threads:[~2009-03-22 20:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-19 17:56 question about conflict resolution across multiple branches William Morgan
2009-03-19 20:11 ` Junio C Hamano
2009-03-22 20:05 ` William Morgan [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1237751617-sup-640@entry \
--to=wmorgan-git@masanjin.net \
--cc=git@vger.kernel.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 NNTP newsgroup(s).