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

Detect merge/rebase conflicts without changing the worktree?

From
KLKlas Lindberg <klas.lindberg@gmail.com>
Date
Oct 27, 2010, 23:40 UTC
Message-ID
<AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com>
Hello

What is the recommended way to detect merge/rebase conflicts without actually modifying the worktree? Should I use some combination of custom $GIT_INDEX_FILE and --work-tree to lock the conflict resolution into a directory specially made for this purpose? Is there even a way to have the conflict-annotated files written to stdout instead of to file system when a merge fails?

BR / Klas
Next: Jonathan Nieder
Message 1 of 3 in “Detect merge/rebase conflicts without changing the worktree?”
  1. Klas LindbergOct 27, 2010
  2. Jonathan NiederOct 28, 2010
  3. Klas LindbergOct 28, 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.