Merge remote-tracking branch 'origin/master'

src/de/uni_passau/fim/seibt/gitwrapper/repo/DefaultMergeStrategy.java

@@ -2,7 +2,7 @@ package de.uni_passau.fim.seibt.gitwrapper.repo;
 
 import java.util.Optional;
 
-import de.uni_passau.fim.seibt.gitwrapper.process.ProcessExecutor.ExecRes;
+import static de.uni_passau.fim.seibt.gitwrapper.process.ProcessExecutor.ExecRes;
 
 /**
  * A {@link MergeStrategy} representing the default 'git merge' merge implementation.
@@ -24,14 +24,8 @@ public class DefaultMergeStrategy implements MergeStrategy {
 
     @Override
     public Optional<Status> merge(Reference left, Reference right) {
-        Optional<ExecRes> mergeRes = repo.getGit().exec(repo.getDir(), "merge", "-n", "-q", right.getId());
-
-        if (mergeRes.isPresent() && mergeRes.get().failed()) {
-            // merge failed, and we don't want to know the state of the repo at the parent
-            return Optional.empty();
-        }
-
-        return mergeRes.flatMap(res -> repo.getStatus());
+        Optional<ExecRes> mergeBase = repo.getGit().exec(repo.getDir(), "merge", "-n", "-q", right.getId());
+        return mergeBase.flatMap(res -> repo.getStatus());
     }
 
     @Override