Hi Phillip,
Phillip Wood (phillip.wood123@gmail.com) a écrit :
Hi Alban
On 25/06/2020 13:19, Alban Gruin wrote:
quoted
This teaches the sequencer to invoke the "resolve" strategy with a
function call instead of forking.
This is a good idea, however we should check the existing tests that use this
strategy to see if they are doing so to test the try_merge_command() code
path. I've got some patches in seen that use '--strategy=resolve' to exercise
the "non merge-recursive" code path, so I'll update them to use a proper
custom merge strategy.
Is it worth optimizing do_merge() to take advantage of resolve and octopus
being builtin as well?
Hmm, I see that do_merge() doesn't call directly the strategies, and
delegates this work to git-merge. If calling the new APIs does not imply
to copy/paste too much code from merge.c, then my answer is yes.
Best Wishes
Phil
Cheers,
Alban