From 9cf1cba9b7160ae9a594147a94256581aada8a60 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 28 Feb 2025 19:08:27 +0800 Subject: [PATCH] feature: apply commit message while continue merge/revert (#1027) Signed-off-by: leo --- src/ViewModels/WorkingCopy.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index afaf5868..3033da07 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -445,6 +445,10 @@ namespace SourceGit.ViewModels _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(() => {