0

Save the merge message and Conflicts list right after merge with conflicts.

Pavel Gorin 3 years ago updated by Thomas Singer 3 years ago 2

Scenario:

1)Merge some branch with conflicts

2)Resolve conflicts

3)Commit.

At the 3rd stage I have my commit message empty. I would like to see (merge '...' to '...', conflicts: [...]). May be this happens because We have .gitct file on our project and message is overwritten by it. I would like you to override it in merge cases. GitExtensions does this.

Are you sure SmartGit does so with .gitct file as I mentioned? Seems strange to me. I set up my git hooks the same way as others. GitExtensions guy has the message. And we have only commit-msg hook, which is triggered after commit message is already edited.