From: Jonathan Nieder <jrnieder@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Documentation: document pitfalls with 3-way merge
Date: Sun, 8 Dec 2013 14:40:13 -0800 [thread overview]
Message-ID: <20131208224013.GC9108@google.com> (raw)
In-Reply-To: <1386535227-209788-1-git-send-email-sandals@crustytoothpaste.net>
Hi,
brian m. carlson wrote:
> Oftentimes people will make the same change in two branches, revert the change
> in one branch, and then be surprised when a merge reinstitutes that change when
> the branches are merged.
Life is even more complicated: if the merge-base chosen happens to be
a descendent of the change on both branches, the merge won't reinstate
the change.
The problem scenario hasn't happened to me recently. Can you give an
example of how it happens? Why is the same change being made
independently on two different branches? I'm wondering because such a
story could make the example in the documentation a little clearer and
avoid having to make the explanation overly technical.
In any event, that the 3-way merge is really just a stupid 3-way merge
(modulo multiple merge base madness) does seem worth emphasizing, so
thanks for working on this.
Hope that helps,
Jonathan
next prev parent reply other threads:[~2013-12-08 22:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-08 20:40 [PATCH] Documentation: document pitfalls with 3-way merge brian m. carlson
2013-12-08 22:40 ` Jonathan Nieder [this message]
2013-12-08 22:55 ` brian m. carlson
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=20131208224013.GC9108@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
/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