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

2 comments

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.

0

Ok, i unchek the "Clear initial commit message" (settings -> version control -> changelists). I will see and post confirmation as soon as I have it

0

Please sign in to leave a comment.