From: Philip Oakley <philipoakley@iee.org>
Date: Sat, 28 Oct 2017 17:50:19 GMT
Subject: Re: How to re-merge paths differently?
Message-ID: <CDBB804CFC3842CF862FE12D99D60D79@PhilipOakley>
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]