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

Re: git and appending merge commits

From
Adam Majer <adamm@zombino.com>
Date
May 26, 2008, 06:39 UTC
Message-ID
<483A5B22.3070809@zombino.com>
In-Reply-To
<7vej7pek3z.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
Show 6 quoted lines
> In a combined diff, unlike the single column to show "+/-/ " at the
> beginning for one-parent diff, each parent gets one column.  And in a
> condensed combined diff, a hunk whose result is inherited solely from one
> parent (iow, a trivial conflict resolution) is removed from the output, so
> that only a non-trivial conflict resolution that leaves result that is
> different from all parents are shown.

Thank you Junio and Shawn for the very clear explanation! Now it makes very good sense why the patch looks so "weird" :) For cases where both branches touch the same file and there is a conflict, this would be very useful indeed.

Cheers, Adam

Previous: Junio C Hamano
Message 4 of 4 in “git and appending merge commits”
  1. Adam MajerMay 26, 2008
  2. Shawn O. PearceMay 26, 2008
  3. Junio C HamanoMay 26, 2008
  4. Adam MajerMay 26, 2008

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.