From: "Philip Oakley" <philipoakley@xxxxxxx>
From: "Sergey Organov" <sorganov@xxxxxxxxx>
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]
