When merging and there are merge conflicts this will be shown in the commit message by default. After fixing these conflicts, committing is not possible.

I add a commit message, but the commit button is greyed out. After some time the commit message is reset to the conflict warnings and the commit button is available for a short time. This seems to be repeating infinite.

"Workaround" is to wait for the reset, replace the commit message fast and hit commit before it gets greyed out again.