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

Re: Why git-merge-resolve in git-am?

From
Junio C Hamano <junkio@cox.net>
Date
Dec 28, 2006, 02:28 UTC
Message-ID
<7virfw3gb2.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20061228022038.GE16612@spearce.org>
Shawn Pearce <spearce@spearce.org> writes:
> Good reasons, but all are strictly historical.  So there's actually
> no technical reason we can't use merge-recursive here in git-am.

A very early version of recursive was unusable (it did not pay attention to the merge base the caller gave it and tried to always compute it by itself), but that was fixed sometime later.

I do not recall offhand C version still has that fix (I think it does but you should double check); as long ias it honors the merge base the caller computed, it should be Ok to replace resolve with recursive. Go wild.

Previous: Shawn PearceNext: Shawn Pearce
Message 4 of 5 in “Why git-merge-resolve in git-am?”
  1. Shawn PearceDec 28, 2006
  2. Junio C HamanoDec 28, 2006
  3. Shawn PearceDec 28, 2006
  4. Junio C HamanoDec 28, 2006
  5. Shawn PearceDec 28, 2006

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.