How to re-merge paths differently?
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
From: "Sergey Organov" <[email protected]>
Quoted 11 lines
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 with conflicts within them following the git merge b.
You then want a variant of the git merge command that will apply the -X ours policy *specifically to path x* so that its particular set of conflicts is fully resolved in favour of 'ours'.
You then want to repeat those path specific resolutions, on a path by path basis, to either -X ours or -X theirs until they are done.
You are also expecting that one or two conflicts will require to be fully manually resolved, until finally you can commit the result.
Would that be right?
Also, how do you intend to identify the 'x' and the 'y' paths, so that you can chose the ours/theirs/manual selection? (e.g. do you pre-know a regex/blob expansion)
The answer for individual paths is probably in the mergetool of your choice. --
Philip
From: "Philip Oakley" <[email protected]>
Quoted 10 lines
From: "Sergey Organov" <[email protected]>
Quoted 9 lines
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
Quoted 4 lines
Quoted 2 lines
[*] 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/
Quoted 2 lines
with conflicts within them following the
git merge b.
[snip]
Quoted 10 lines · Philip Oakley
From: "Sergey Organov" <[email protected]>
Quoted 9 lines
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
Quoted 5 lines
Quoted 2 lines
[*] I do mean '-X' above, not '-s'.
By this I presume you mean that you have paths x and y that ate the ones with conflicts within them following the
git merge b.
I rather mean huge amount of conflicting paths in 'x' and 'y' subdirectories of my working tree after a merge, plus a few conflicting paths elsewhere.
Quoted 4 lines
You then want a variant of the
git mergecommand that will apply the-X ourspolicy *specifically to path x* so that its particular set of conflicts is fully resolved in favour of 'ours'.
Almost. I mean to apply 'ours' option to the default 'recursive' policy for all the files that reside in the directory 'x' of my working tree and all its subdirectories (i.e., all the paths 'x/*')
Quoted 3 lines
You then want to repeat those path specific resolutions, on a path by path basis, to either
-X oursor-X theirsuntil they are done.
No. I mean to apply '-X ours' to everything under 'x/', and '-X theirs' to everything under 'y/'. Avoiding to repeat anything is the intention.
Quoted 2 lines
You are also expecting that one or two conflicts will require to be fully manually resolved, until finally you can commit the result.
No, I expect no conflicts left in either 'x/' or 'y/' after "re-merge", as neither 'theirs' or 'ours' should leave anything unresolved, and all the other conflicting paths (left from original merge elsewhere) I mean to resolve manually.
Quoted 6 lines
Would that be right?
Also, how do you intend to identify the 'x' and the 'y' paths, so that you can chose the ours/theirs/manual selection? (e.g. do you pre-know a regex/blob expansion)
All the 'x/*' paths need 'ours', and all the 'y/*' paths need 'theirs'.
Quoted 3 lines
The answer for individual paths is probably in the mergetool of your choice.
There are a lot of files under 'x/' and a lot of them under 'y/'. My intention is to automate a lot of manual labor, and I'm not aware of a mergetool that provides either '-X ours' or '-X theirs' resolution automatically for all the paths specified.
-- Sergey