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

Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

From
Philip Oakley <philipoakley@iee.email>
Date
Sep 24, 2019, 22:05 UTC
Message-ID
<7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email>
In-Reply-To
<b2f412e2-d95f-0f73-5341-73c19ee2c6f7@iee.email>

Hi list, cc Pratyush,

[resend without attached png file]

While rebasing an old series, I had a 3-way merge fall back that didn't show the `||||||| merged common ancestors` very well in git-gui.

That is, the conflict markers, and common ancestor lines, are treated as being part of the current HEAD hunk, rather than being separated.

I opened a Git for Windows issue https://github.com/git-for-windows/git/issues/2340 which has the screenshot of the git-gui markers.

I've not had any chance to look at the underlying code, but thought it worth reporting. I guess the issue has been there a while.

Philip
Previous: Philip OakleyNext: Bert Wesarg
Message 2 of 5 in “git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)”
  1. Philip OakleySep 24, 2019
  2. Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)Philip Oakley, Sep 24, 2019
  3. Bert WesargSep 25, 2019
  4. Philip OakleySep 25, 2019
  5. Pratyush YadavSep 25, 2019

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.