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

git mergetool documentation oversight?

From
CChris.Cheney <chris.cheney.nospam@tesco.net>
Date
Jun 14, 2010, 08:01 UTC
Message-ID
<Xns9D975C4C1419DChrisCheneytesconet@80.91.229.10>

Having just tripped over this, it would be helpful if the fact that git mergetool saves the merge-conflict version of the file with a .orig suffix and that the file should be deleted before adding and committing the merge (as described at http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/) were documented on the git-mergetool page.

Chris
Message 1 of 1 in “git mergetool documentation oversight?”
  1. Chris.CheneyJun 14, 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.