Automatic commit message when solving conflict
Answered
Hi,
I have an issue when merging two branches with conflicts between them. When I reach the point when I am supposed to push my manual modification, the automatic git commit message is not showing up.
I am talking about the one looking like :
"Merged in XXXX (pull request #123)
# Conflicts:
# routes/user.js"
What is the correct way to this through webstorm
Thanks a lot
Baptiste
Please sign in to leave a comment.
In fact, the Merge commit text should be there. Probably, the message is overridden by some other source - e.g. if you use Task server with message template (see https://youtrack.jetbrains.com/issue/IDEA-173186) or just have some other commit message saved in the Changelist description.
Ok, i unchek the "Clear initial commit message" (settings -> version control -> changelists). I will see and post confirmation as soon as I have it
Unchecking this setting did not bring back this helpful message for me on IntelliJ Ultimate 2020.3
The issue might be an older message stuck in the Default changelist description, so the message is used now and overrides all others - https://youtrack.jetbrains.com/issue/IDEA-113049
Edit the default changelist and clear the description as a workaround.
It there any updates? Cause it looks like on WebStorm 2021.1.1. there is still no opportunity to change auto-generated commit message (or change this template).
Самат Жетибаев could you please elaborate on the issue that you are facing?
Do you use the "Task server" by chance?
If you right-click on a changelist -> Edit Changelist -> 'Comment' field - do you see your auto-generated commit message there?
Could you also check `git config commit.template` and see whether there is any template defined?