|
|
@@ -538,6 +538,15 @@ public class ResolveMerger extends ThreeWayMerger { |
|
|
|
if (isWorktreeDirty(work)) |
|
|
|
return false; |
|
|
|
|
|
|
|
// Don't attempt to resolve submodule link conflicts |
|
|
|
if (isGitLink(modeO) || isGitLink(modeT)) { |
|
|
|
add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, 0, 0); |
|
|
|
add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, 0, 0); |
|
|
|
add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, 0, 0); |
|
|
|
unmergedPaths.add(tw.getPathString()); |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
MergeResult<RawText> result = contentMerge(base, ours, theirs); |
|
|
|
File of = writeMergedFile(result); |
|
|
|
updateIndex(base, ours, theirs, result, of); |
|
|
@@ -770,6 +779,10 @@ public class ResolveMerger extends ThreeWayMerger { |
|
|
|
return mode != 0 && !FileMode.TREE.equals(mode); |
|
|
|
} |
|
|
|
|
|
|
|
private static boolean isGitLink(final int mode) { |
|
|
|
return FileMode.GITLINK.equals(mode); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ObjectId getResultTreeId() { |
|
|
|
return (resultTree == null) ? null : resultTree.toObjectId(); |