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

git mergetool vs stash apply

From
Alexander Gladysh <agladysh@gmail.com>
Date
May 20, 2008, 08:02 UTC
Message-ID
<c6c947f60805200102h3fd27742vfd9310912907cfa@mail.gmail.com>
Hi, list!
The git mergetool ignores conflicts by git stash apply:

$ git stash apply Auto-merged path/file.ext CONFLICT (content): Merge conflict in path/file.ext

$ git mergetool merge tool candidates: kdiff3 kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge vimdiff No files need merging

While path/file.ext do contain merge conflict.

The git mergetool works for git merge and git rebase. Maybe it should work for git stash as well? I automatically type git mergetool when I see CONFLICT in Git output. %-)

Alexander.
Next: Jeff King
Message 1 of 6 in “git mergetool vs stash apply”
  1. Alexander GladyshMay 20, 2008
  2. Jeff KingMay 20, 2008
  3. Alexander GladyshMay 20, 2008
  4. Jakub NarebskiMay 20, 2008
  5. Alexander GladyshMay 20, 2008
  6. Jeff KingMay 20, 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.