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

Re: question about conflict resolution across multiple branches

From
WMWilliam Morgan <wmorgan-git@masanjin.net>
Date
Mar 22, 2009, 20:05 UTC
Message-ID
<1237751617-sup-640@entry>
In-Reply-To
<7viqm58e8r.fsf@gitster.siamese.dyndns.org>
Reformatted excerpts from Junio C Hamano's message of 2009-03-19:
>     $ git diff origin/next >fixup.patch

Ok, this is helpful. So git diff will give me an explicit dump of the conflict resolution changes, which I can use with git apply --index when I see the conflict. Sort of a manual, shared, git-rerere.

Wouldn't it be simpler for git format-patch to produce something for a merge commit with conflicts? (Maybe there's a way and I just can't find it?)

> Needless to say, you need to be careful when accepting such a fixup
> patch.
More careful than when accepting a "regular" patch?
Thanks for your help!
-- 
William <wmorgan-git@masanjin.net>
Previous: Junio C Hamano
Message 3 of 3 in “question about conflict resolution across multiple branches”
  1. William MorganMar 19, 2009
  2. Junio C HamanoMar 19, 2009
  3. William MorganMar 22, 2009

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.