Add conflict type

2025-11-03 12:05:52 +01:00 · 2019-11-14 15:07:49 +01:00
parent 47da287178
commit ff1abf2c1c
2 changed files with 9 additions and 1 deletions
--- 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;