code_review: PR #1495

love-linger · love-linger · commit 5240222846b1 · 2025-07-03T10:24:43.000+08:00
- remove unused namespace using
- prefer to use repository's configuration than the global `merge.ff`

Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
@@ -84,9 +83,9 @@ public override Task<bool> Sure()
         private Models.MergeMode AutoSelectMergeMode()
         {
             return
-                GetGitConfigBranchMergeOptions()
-                ?? GetGitConfigMergeFF()
-                ?? GetSettingsPreferredMergeMode();
+                GetGitConfigBranchMergeOptions() // Branch
+                ?? GetSettingsPreferredMergeMode() // Repository
+                ?? GetGitConfigMergeFF(); // Global
         }
 
         private Models.MergeMode GetSettingsPreferredMergeMode()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Threading.Tasks;`
	`1`	`+using System.Threading.Tasks;`
`3`	`2`
`4`	`3`	`namespace SourceGit.ViewModels`
`5`	`4`	`{`
`@@ -84,9 +83,9 @@ public override Task<bool> Sure()`
`84`	`83`	`private Models.MergeMode AutoSelectMergeMode()`
`85`	`84`	`{`
`86`	`85`	`return`
`87`		`- GetGitConfigBranchMergeOptions()`
`88`		`- ?? GetGitConfigMergeFF()`
`89`		`- ?? GetSettingsPreferredMergeMode();`
	`86`	`+ GetGitConfigBranchMergeOptions() // Branch`
	`87`	`+ ?? GetSettingsPreferredMergeMode() // Repository`
	`88`	`+ ?? GetGitConfigMergeFF(); // Global`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`private Models.MergeMode GetSettingsPreferredMergeMode()`