git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: unexpected git-merge result

From
DRDale Rowley <ddrowley3@juno.com>
Date
Feb 22, 2010, 17:24 UTC
Message-ID
<loom.20100222T173851-763@post.gmane.org>
In-Reply-To
<20100222054425.GC10191@dpotapov.dyndns.org>
Dmitry Potapov <dpotapov <at> gmail.com> writes:
Show 6 quoted lines
> > 
> > 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?

Previous: Dmitry Potapov
Message 5 of 5 in “unexpected git-merge result”
  1. Dale RowleyFeb 19, 2010
  2. Junio C HamanoFeb 19, 2010
  3. Dale RowleyFeb 20, 2010
  4. Dmitry PotapovFeb 22, 2010
  5. Dale RowleyFeb 22, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.