From: Erik Cervin Edin <erik@cervined.in>
To: Andrey Butirsky <butirsky@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts
Date: Wed, 29 Dec 2021 15:51:26 +0100 [thread overview]
Message-ID: <CA+JQ7M9ANzeiZC7uLPoe671hT8wGDyO7tWu7+YxfDB0QE6YR5Q@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2021-12-29 14:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 12:52 request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts Andrey Butirsky
[not found] ` <CA+JQ7M-By65FVPnMFnwE8zx3T4O7DV3_5Kf2P6eZhP4Zcemorg@mail.gmail.com>
2021-12-28 20:44 ` Andrey Butirsky
2021-12-28 21:50 ` Erik Cervin Edin
2021-12-29 12:13 ` Erik Cervin Edin
2021-12-29 13:35 ` Andrey Butirsky
2021-12-29 14:51 ` Erik Cervin Edin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+JQ7M9ANzeiZC7uLPoe671hT8wGDyO7tWu7+YxfDB0QE6YR5Q@mail.gmail.com \
--to=erik@cervined.in \
--cc=butirsky@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).