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

Re: Conflict markers in mergetool $LOCAL ?

From
Seth House <seth@eseth.com>
Date
Aug 17, 2010, 21:04 UTC
Message-ID
<loom.20100817T230158-934@post.gmane.org>
In-Reply-To
<f595ee73-b1a3-4797-bf55-20c0f1b309e0@email.android.com>
Jacob Helwig <jacob.helwig <at> gmail.com> writes:
> That actually looks exactly like it should.  The order of the windows
> that vimdiff uses is (IIRC): ours, on-disk file, theirs.

Hm, you’re right. I just found the git-mergetool--lib script on my system and it opens vimdiff with $LOCAL $MERGED $REMOTE. Thank you, that opened my eyes enough to clarify my question:

The conflict markers don't seem very useful in the context of a merge tool. I would prefer to see two windows in vimdiff with each side of the conflict, respectively. Something like:

vimdiff $MERGED-left-hand-conflicts $MERGED-right-hand-conflicts

Is that possible with Git -- or does anyone know of external tools to help with such a workflow?

Previous: Jacob HelwigNext: Charles Bailey
Message 6 of 8 in “Conflict markers in mergetool $LOCAL ?”
  1. Seth HouseAug 17, 2010
  2. David AguilarAug 17, 2010
  3. David AguilarAug 17, 2010
  4. Seth HouseAug 17, 2010
  5. Jacob HelwigAug 17, 2010
  6. Seth HouseAug 17, 2010
  7. Charles BaileyAug 17, 2010
  8. Seth HouseAug 18, 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.