Skip to content

Commit 86c89e0

Browse files
committed
feature: use MERGE_MSG as default commit message while merging (#88)
1 parent ea1d0bf commit 86c89e0

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/ViewModels/WorkingCopy.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,14 @@ public bool SetData(List<Models.Change> changes)
274274
SelectedStagedTreeNode = null;
275275
SetDetail(null, false);
276276
}
277+
278+
// Try to load merge message from MERGE_MSG
279+
if (string.IsNullOrEmpty(_commitMessage))
280+
{
281+
var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
282+
if (File.Exists(mergeMsgFile))
283+
CommitMessage = File.ReadAllText(mergeMsgFile);
284+
}
277285
});
278286

279287
return hasConflict;

0 commit comments

Comments
 (0)