From: Dale Rowley <ddrowley3@juno.com>
Date: Mon, 22 Feb 2010 17:24:33 GMT
Subject: Re: unexpected git-merge result
Message-ID: <loom.20100222T173851-763@post.gmane.org>
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?