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

Re: merge strategy request

From
Junio C Hamano <junkio@cox.net>
Date
Mar 25, 2007, 07:17 UTC
Message-ID
<7v648paj14.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0703242130050.6730@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 16 quoted lines
> On Sun, 25 Mar 2007, Johannes Schindelin wrote:
>> 
>> Basically, just write a program named "git-merge-david-lang", which takes 
>> arguments of the form
>> 
>> 	merge-base [merge-base2...] -- head remote [remote...]
>
> I think you are missing what David wants.
>
> David does *not* want a new global strategy. Adding those is fairly easy.
>
> David seems to want a new per-file merge strategy, with the bog-standard 
> recursive merge. We've talked about that possibility in the past, but we 
> don't do it now. We always end up doing just the three-way merge.
>
> 		Linus

Right. In the current system, git-mergetool might be a better place to add support for special perpose 3-version file-level merge backend than merge-recursive, at least until gitattributes materializes.

Previous: David LangNext: Martin Langhoff
Message 6 of 10 in “merge strategy request”
  1. David LangMar 24, 2007
  2. Johannes SchindelinMar 25, 2007
  3. David LangMar 25, 2007
  4. Linus TorvaldsMar 25, 2007
  5. David LangMar 25, 2007
  6. Junio C HamanoMar 25, 2007
  7. Martin LanghoffMar 25, 2007
  8. David LangMar 25, 2007
  9. Junio C HamanoMar 25, 2007
  10. Martin LanghoffMar 26, 2007

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.