From: Erik Cervin Edin <erik@cervined.in>
Date: Wed, 29 Dec 2021 14:51:26 GMT
Subject: Re: request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts
Message-ID: <CA+JQ7M9ANzeiZC7uLPoe671hT8wGDyO7tWu7+YxfDB0QE6YR5Q@mail.gmail.com>
In-Reply-To: <fffeed2f-c956-d34f-ea5f-73f52e2d2be4@gmail.com>

On Wed, Dec 29, 2021 at 2:35 PM Andrey Butirsky <butirsky@gmail.com> wrote:
>
> This is exactly what I tried to avoid, since Git already seem has all
> the needed under the hood to prevent such disaster..

It'd be neat if you could specify -X ours/theirs/both
But I'm not sure I would describe the current situation as disastrous