Re: request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts

From: Erik Cervin Edin <erik@cervined.in>
Date: Dec 28, 2021, 21:50 UTC
Message-ID: <CA+JQ7M9Ht5vSfDDEuYyK7pBPBvgjzi7L6jEYX8dkP4PMFK-M2Q@mail.gmail.com>
In-Reply-To: <a8f3246f-2b50-e713-16c3-1d23b80a42a1@gmail.com>

> On Tue, Dec 28, 2021 at 9:44 PM Andrey Butirsky <butirsky@gmail.com> wrote:
> Thanks Erik, please post your further replies to the mailing list so
> others could see it also.

Mea culpa

> On a topic,
> I'm not familiar with Git code-base so don't know if it even possible in
> it's current architecture..

It looks like builtin/checkout.c checkout_merged is responsible and calls ll-merge.c ll_merge

I think other commands that allow merging strategies may use other "merge drivers".

From commit a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8

Show 7 quoted lines

> merge: teach -Xours/-Xtheirs to binary ll-merge driver
>
> The (discouraged) -Xours/-Xtheirs modes of merge are supposed to
> give a quick and dirty way to come up with a random mixture of
> cleanly merged parts and punted conflict resolution to take contents
> from one side in conflicting parts.  These options however were only
> passed down to the low level merge driver for text.

It looks possible. But perhaps the sentiment is that it's not adviceable?