From: Sergey Organov <sorganov@gmail.com>
To: git@vger.kernel.org
Subject: How to re-merge paths differently?
Date: Fri, 27 Oct 2017 18:44:20 +0300 [thread overview]
Message-ID: <87wp3g61ez.fsf@javad.com> (raw)
Hello,
Is there anything like this:
$ git merge b
[... lot of conflicts ...]
$ git re-merge -X ours -- x/ # Leaves 0 conflicts in x/
$ git re-merge -X theirs -- y/ # Leaves 0 conflicts in y/
[... resolve the rest of conflicts manually ...]
$ git commit
[*] I do mean '-X' above, not '-s'.
-- Sergey
next reply other threads:[~2017-10-27 15:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 15:44 Sergey Organov [this message]
2017-10-28 17:37 ` How to re-merge paths differently? Philip Oakley
2017-10-28 17:50 ` Philip Oakley
2017-10-30 5:02 ` Sergey Organov
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=87wp3g61ez.fsf@javad.com \
--to=sorganov@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.
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.