From: Andrey Butirsky <butirsky@gmail.com>
Date: Wed, 29 Dec 2021 13:35:07 GMT
Subject: Re: request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts
Message-ID: <fffeed2f-c956-d34f-ea5f-73f52e2d2be4@gmail.com>
In-Reply-To: <CA+JQ7M-gornjkB78Dgx-bHW7Ps=C2936vDNUakQ-VG8KAyZ=YA@mail.gmail.com>

This is exactly what I tried to avoid, since Git already seem has all 
the needed under the hood to prevent such disaster..

On 29.12.2021 15:13, Erik Cervin Edin wrote:
> On a tangent, you can set up your own merge tools.
>
> So in git config you can add something like:
>
> [mergetool "both"]
> cmd = "sed -i -e '/^<<<<<<<$/d' -e '/^=======$/d' -e '/^>>>>>>>$/d' -- $MERGED"
>
> and call it with git mergetool --tool=both