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

Re: Detect merge/rebase conflicts without changing the worktree?

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Oct 28, 2010, 00:01 UTC
Message-ID
<20101028000115.GC30490@burratino>
In-Reply-To
<AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com>
Hi Klas,
Klas Lindberg wrote:
> What is the recommended way to detect merge/rebase conflicts without
> actually modifying the worktree?
You might like "git merge-tree".
Previous: Klas LindbergNext: Klas Lindberg
Message 2 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.