From: Sergey Organov <sorganov@gmail.com>
Date: Fri, 27 Oct 2017 15:44:20 GMT
Subject: How to re-merge paths differently?
Message-ID: <87wp3g61ez.fsf@javad.com>

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