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)
What is the correct way to this through webstorm
Thanks a lot