Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()
From: Stephan Beyer <hidden>
Date: 2016-06-15 22:45:09
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() · Stephan Beyer <hidden>
- 2016-06-15 · Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() · Daniel Barkalow <hidden>
- 2016-06-15 · Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() · Junio C Hamano <hidden>
Hi, Daniel Barkalow wrote:
You might look at builtin-checkout and see if merge_working_tree() could be made cleaner with this API, or if some other API could accomodate both cases more nicely.
Puhh, I've not dug into merging stuff that deep, but for me it does not look that this can be done in a useful way, i.e. merge_working_tree() does not do a recursive merge. Regards. -- Stephan Beyer [off-list ref], PGP 0x6EDDD207FCC5040F