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

Re: [PATCH 2/3] make union merge an xdl merge favor

From
Bert Wesarg <bert.wesarg@googlemail.com>
Date
Mar 1, 2010, 06:57 UTC
Message-ID
<36ca99e91002282257i7f07f035o15d8d64e062ee94e@mail.gmail.com>
In-Reply-To
<7vwrxx2k29.fsf@alter.siamese.dyndns.org>
On Sun, Feb 28, 2010 at 21:15, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> Bert Wesarg <bert.wesarg@googlemail.com> writes:
>
>> The current union merge driver is implemented as an post process.  But the
>> xdl_merge code is quite capable to produce the result by itself.  Therefore
>> move to it there and teach git-merge-file a new --union option.
>
> I like the idea of patch 2 and 3 but they are independent of what we do
> (or don't do) to merge-file.  Could you flip the order of the patches so
> that 2 and 3 can go first?

WIll do. On a side note: I plan to support the --union option also for git-checkout. Would that be a good idea?

Bert
>
>
>
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 10 in “merge-file: add option to specify the marker size”
  1. 1/3 merge-file: add option to specify the marker sizeBert Wesarg, Feb 28, 2010
  2. 2/3 make union merge an xdl merge favorBert Wesarg, Feb 28, 2010
  3. Junio C HamanoFeb 28, 2010
  4. Bert WesargMar 1, 2010
  5. Junio C HamanoMar 1, 2010
  6. Bert WesargMar 1, 2010
  7. Junio C HamanoMar 1, 2010
  8. 3/3 refactor merge flags into xmparam_tBert Wesarg, Feb 28, 2010
  9. Junio C HamanoFeb 28, 2010
  10. Bert WesargMar 1, 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.