From: Andrey Butirsky <butirsky@gmail.com>
To: Erik Cervin Edin <erik@cervined.in>
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 16:35:07 +0300 [thread overview]
Message-ID: <fffeed2f-c956-d34f-ea5f-73f52e2d2be4@gmail.com> (raw)
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
next prev parent reply other threads:[~2021-12-29 13:35 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 [this message]
2021-12-29 14:51 ` Erik Cervin Edin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fffeed2f-c956-d34f-ea5f-73f52e2d2be4@gmail.com \
--to=butirsky@gmail.com \
--cc=erik@cervined.in \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.