From ff1abf2c1c5e4a939c96a96dc294b03fe34bab60 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 14 Nov 2019 15:07:49 +0100
Subject: [PATCH] Add conflict type

---
 .../java/sonia/scm/repository/spi/MergeConflictResult.java | 7 ++++++-
 .../java/sonia/scm/repository/spi/GitMergeCommand.java     | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
index 981a5c5446..206cf7e7dc 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.ADDED_BY_BOTH;
 import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.BOTH_MODIFIED;
 import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.DELETED_BY_THEM;
 import static sonia.scm.repository.spi.MergeConflictResult.ConflictTypes.DELETED_BY_US;
@@ -28,6 +29,10 @@ public class MergeConflictResult {
     conflicts.add(new SingleMergeConflict(DELETED_BY_US, path, null));
   }
 
+  public void addAddedByBoth(String path) {
+    conflicts.add(new SingleMergeConflict(ADDED_BY_BOTH, path, null));
+  }
+
   public static class SingleMergeConflict {
     private final ConflictTypes type;
     private final String path;
@@ -53,6 +58,6 @@ public class MergeConflictResult {
   }
 
   public enum ConflictTypes {
-    BOTH_MODIFIED, DELETED_BY_THEM, DELETED_BY_US
+    BOTH_MODIFIED, DELETED_BY_THEM, DELETED_BY_US, ADDED_BY_BOTH
   }
 }
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 505594ba8b..367cd1db4d 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
@@ -142,6 +142,9 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
             throw new InternalRepositoryException(repository, "could not calculate diff for path " + path, e);
           }
           break;
+        case BOTH_ADDED:
+          result.addAddedByBoth(path);
+          break;
         case DELETED_BY_THEM:
           result.addDeletedByThem(path);
           break;