git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Philip Oakley" <philipoakley@iee.org>
To: "Philip Oakley" <philipoakley@iee.org>,
	"Sergey Organov" <sorganov@gmail.com>, <git@vger.kernel.org>
Subject: Re: How to re-merge paths differently?
Date: Sat, 28 Oct 2017 18:50:19 +0100	[thread overview]
Message-ID: <CDBB804CFC3842CF862FE12D99D60D79@PhilipOakley> (raw)
In-Reply-To: 3655514352684AD398D17E83FF47F986@PhilipOakley

From: "Philip Oakley" <philipoakley@iee.org>
> From: "Sergey Organov" <sorganov@gmail.com>
>> 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'.
>>
> 
> By this I presume you mean that you have paths x and y that ate the ones 

s/ate/are/   

> with conflicts within them following the `git merge b`.
> 

[snip]

  reply	other threads:[~2017-10-28 17:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-27 15:44 How to re-merge paths differently? Sergey Organov
2017-10-28 17:37 ` Philip Oakley
2017-10-28 17:50   ` Philip Oakley [this message]
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

  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=CDBB804CFC3842CF862FE12D99D60D79@PhilipOakley \
    --to=philipoakley@iee.org \
    --cc=git@vger.kernel.org \
    --cc=sorganov@gmail.com \
    /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).