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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html