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

Bert Wesarg [off-list ref] 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?

On Sun, Feb 28, 2010 at 21:15, Junio C Hamano [off-list ref] wrote:

Bert Wesarg [off-list ref] writes:

quoted

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