From: Dale Rowley <ddrowley3@juno.com>
To: git@vger.kernel.org
Subject: Re: unexpected git-merge result
Date: Mon, 22 Feb 2010 17:24:33 +0000 (UTC) [thread overview]
Message-ID: <loom.20100222T173851-763@post.gmane.org> (raw)
In-Reply-To: 20100222054425.GC10191@dpotapov.dyndns.org
Dmitry Potapov <dpotapov <at> gmail.com> writes:
> >
> > G only removed a few of the lines that were brought over in the cherry-pick
> > (D'), so it was surprising when they re-appeared in H.
>
> git merge does 3-way merge, which means that it does not look at whole
> history but only on the current state and the merge base.
Yes, but my point is that this is the wrong thing to do in the case that I
described above. If you explicitly remove some content in your branch, then it's
bad when a merge causes it to re-appear without even any conflicts. The opposite
is also possible (you add content to your branch and it silently disappears
during a merge), so shouldn't this be a big concern?
prev parent reply other threads:[~2010-02-22 17:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-19 21:35 unexpected git-merge result Dale Rowley
2010-02-19 22:27 ` Junio C Hamano
2010-02-20 3:45 ` Dale Rowley
2010-02-22 5:44 ` Dmitry Potapov
2010-02-22 17:24 ` Dale Rowley [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=loom.20100222T173851-763@post.gmane.org \
--to=ddrowley3@juno.com \
--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).