feature: apply commit message while continue merge/revert (#1027)

love-linger · love-linger · commit 9cf1cba9b716 · 2025-02-28T19:08:27.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -445,6 +445,10 @@ public void ContinueMerge()
                 _repo.SetWatcherEnabled(false);
                 Task.Run(() =>
                 {
+                    var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
+                    if (File.Exists(mergeMsgFile))
+                        File.WriteAllText(mergeMsgFile, _commitMessage);
+
                     var succ = _inProgressContext.Continue();
                     Dispatcher.UIThread.Invoke(() =>
                     {

Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,10 @@ public void ContinueMerge()`
`445`	`445`	`_repo.SetWatcherEnabled(false);`
`446`	`446`	`Task.Run(() =>`
`447`	`447`	`{`
	`448`	`+ var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");`
	`449`	`+ if (File.Exists(mergeMsgFile))`
	`450`	`+ File.WriteAllText(mergeMsgFile, _commitMessage);`
	`451`	`+`
`448`	`452`	`var succ = _inProgressContext.Continue();`
`449`	`453`	`Dispatcher.UIThread.Invoke(() =>`
`450`	`454`	`{`