From bc2ab92d2aeff42c5321c07e22452f2b07e20ef1 Mon Sep 17 00:00:00 2001
From: Sina Hinderks <sina@hinderks.net>
Date: Thu, 3 Jul 2025 08:02:50 +0200
Subject: [PATCH] fix: `merge.ff` is ignored

After changing the priority of the preferences/configurations for the
merge mode in #1495, the git configuration `merge.ff` was ignored.  The
reason is, that `GetSettingsPreferredMergeMode()` does not return `null`
in the default case.  This is now fixed.
---
 src/ViewModels/Merge.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index b00db6b69..28a73f6c1 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -85,17 +85,17 @@ private Models.MergeMode AutoSelectMergeMode()
             return
                 GetGitConfigBranchMergeOptions() // Branch
                 ?? GetSettingsPreferredMergeMode() // Repository
-                ?? GetGitConfigMergeFF(); // Global
+                ?? GetGitConfigMergeFF() // Global
+                ?? Models.MergeMode.Default; // Fallback
         }
 
         private Models.MergeMode GetSettingsPreferredMergeMode()
         {
             var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode;
             if (preferredMergeModeIdx < 0 || preferredMergeModeIdx > Models.MergeMode.Supported.Length)
-                preferredMergeModeIdx = 0;
+                return Models.MergeMode.Supported[preferredMergeModeIdx];
 
-            var defaultMergeMode = Models.MergeMode.Supported[preferredMergeModeIdx];
-            return defaultMergeMode;
+            return Models.MergeMode.Default;
         }
 
         private Models.MergeMode GetGitConfigMergeFF()