git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Andrey Butirsky <butirsky@gmail.com>
To: git@vger.kernel.org
Subject: request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts
Date: Mon, 27 Dec 2021 15:52:03 +0300	[thread overview]
Message-ID: <3e1548ab-5e20-9555-bd10-d6cbf2ffbce4@gmail.com> (raw)

Hi, stumbling upon this again and again, so decided to write finally,

while in conflicting state, the only thing we can do to auto-pick one or 
another side of conflict is passing --ours/--theirs option to git-checkout:
git checkout --ours/--theirs <path>

The problem is - it doesn't actually do a _merge_, i.e. you lose all 
non-conflicted changes.

There is no easy way to solve that currently without third-party tools.

This link illustrates it:
https://stackoverflow.com/a/68498101/1063363

Proposal:
Shell we add -X <strategy-option> to git checkout <path> to allow it do 
a merge and _actually solve_ merge conflicts?
That would be in-pair with other commands taking the option already: 
git-merge, git-rebase, (etc.?)


             reply	other threads:[~2021-12-27 12:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-27 12:52 Andrey Butirsky [this message]
     [not found] ` <CA+JQ7M-By65FVPnMFnwE8zx3T4O7DV3_5Kf2P6eZhP4Zcemorg@mail.gmail.com>
2021-12-28 20:44   ` request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts 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

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=3e1548ab-5e20-9555-bd10-d6cbf2ffbce4@gmail.com \
    --to=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).