michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: use MERGE_MSG as default commit message while merging (#88)

Browse source
This commit is contained in:
leo 2024-04-26 21:05:00 +08:00
parent ea1d0bf6a2
commit 86c89e0c33
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ViewModels/WorkingCopy.cs
View file

@ -274,6 +274,14 @@ namespace SourceGit.ViewModels
SelectedStagedTreeNode = null; SelectedStagedTreeNode = null;
SetDetail(null, false); SetDetail(null, false);
} }
// Try to load merge message from MERGE_MSG
if (string.IsNullOrEmpty(_commitMessage))
{
var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
if (File.Exists(mergeMsgFile))
CommitMessage = File.ReadAllText(mergeMsgFile);
}
}); });
return hasConflict; return hasConflict;