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

Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]

From
Jon Seymour <jon.seymour@gmail.com>
Date
Mar 27, 2010, 03:34 UTC
Message-ID
<2cfc40321003262034m7b543b16xbc281899dc7beba2@mail.gmail.com>
| changed conflict --> __change___
Show 6 quoted lines
>
> As a result, the user thinks that the only __change__ is the import
> statement, and elects to resolve the commit in favour of the local
> commit. This is the wrong thing to do because the remote hunk is then
> lost to the history.
>
Message 1 of 1 in “Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]”
  1. Jon SeymourMar 27, 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.