From ecec0764f8b72fcfb2242bea5162b366b2168121 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 15 Nov 2019 09:31:08 +0100 Subject: [PATCH] Invert merge to get proper file diff --- .../java/sonia/scm/repository/spi/GitMergeCommand.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java index 367cd1db4d..69eb8b0748 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java @@ -49,7 +49,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand @Override public MergeConflictResult computeConflicts(MergeCommandRequest request) { - return inClone(git -> new ConflictWorker(git, request), workdirFactory, request.getBranchToMerge()); + return inClone(git -> new ConflictWorker(git, request), workdirFactory, request.getTargetBranch()); } private MergeCommandResult mergeWithStrategy(MergeCommandRequest request) { @@ -104,8 +104,8 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand private ConflictWorker(Git git, MergeCommandRequest request) { super(git, context, repository); - theirs = request.getTargetBranch(); - ours = request.getBranchToMerge(); + theirs = request.getBranchToMerge(); + ours = request.getTargetBranch(); treeParser = new CanonicalTreeParser(); diffBuffer = new ByteArrayOutputStream(); @@ -146,10 +146,10 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand result.addAddedByBoth(path); break; case DELETED_BY_THEM: - result.addDeletedByThem(path); + result.addDeletedByUs(path); break; case DELETED_BY_US: - result.addDeletedByUs(path); + result.addDeletedByThem(path); break; default: throw new InternalRepositoryException(context.getRepository(), "unexpected conflict type: " + stageState);