From b4f1e8874af7399599041be50de41ff2d442c7c7 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 6 Nov 2019 09:54:17 +0100
Subject: [PATCH] change mergeStrategy order

---
 .../src/main/java/sonia/scm/repository/api/MergeStrategy.java | 4 ++--
 .../main/java/sonia/scm/repository/spi/GitMergeCommand.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java b/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java
index 8fa6b1c49c..4ccf1f706b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/MergeStrategy.java
@@ -1,7 +1,7 @@
 package sonia.scm.repository.api;
 
 public enum MergeStrategy {
-  SQUASH,
   MERGE_COMMIT,
-  FAST_FORWARD_IF_POSSIBLE
+  FAST_FORWARD_IF_POSSIBLE,
+  SQUASH
 }
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 378ec3afbd..ff882b4f20 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
@@ -34,9 +34,9 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
   private final GitWorkdirFactory workdirFactory;
 
   private static final Set<MergeStrategy> STRATEGIES = ImmutableSet.of(
-    MergeStrategy.SQUASH,
     MergeStrategy.MERGE_COMMIT,
-    MergeStrategy.FAST_FORWARD_IF_POSSIBLE
+    MergeStrategy.FAST_FORWARD_IF_POSSIBLE,
+    MergeStrategy.SQUASH
   );
 
   GitMergeCommand(GitContext context, sonia.scm.repository.Repository repository, GitWorkdirFactory workdirFactory) {