Automated generated commit message after merge is missing Follow
I was used to the behaviour that after I resolved a merge conflict (after git pull in Intellij directly) and then committing, that an automated commit message was created. Something like 'merged xyz into abc, merge conflicts: fileABC.js, fileXYZ.java'
But either I changed a setting or Intellij removed that feature?
Please sign in to leave a comment.
Please check the similar ticket and let me know if the provided solution (untick the "Clear initial commit message" and clear a commit message saved in the Changelist description) does not work for you.
I'm on latest IntelliJ Ultimate 2020.2, "clear initial commit message" is unticked and I don't see automated commit message for resolved merge conflicts. This is one of the few issues I have, which are forcing me to use SourceTree.
Piotr Hlawski could you please clarify whether the commit message field is empty or it contains some older commit message or always the same message?
Usually it contains previous commit message.
I had same issue , the merge commit is completely missing on fast forward merges even though I select the option to have merge commit no matter what. Please help
It used to show the curved line in Git log , now since there is no merge commit it just show in straight line and THERE IS NO WAY TO DIFFERENTIATE IT FROM REBASE.
Would appreciate if you can take a look.
ff-merge is the default behavior for merge when it's possible and unless it's configured otherwise. The behavior that you see is expected.
I am also missing that autogenerated message. It read like in the linked thread by Konstantin and it was quite helpful to me finding merge errors as it would tell me where someone (like me) had resolved merge errors.
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.
I was also facing the same issue. The auto-generated merge commit message was missing. I got it again by disabling new un-modal commit interface by unticking Settings -> Verison Control -> Commit -> Use non-modal commit interface
This seems to be even more of a problem when using the non-modal commit interface.
Muma David Bwalya do you have "Clear initial commit message" enabled under Preferences | Version Control | Commit?
Ruslan Kuleshov It's disabled. Should it be on? Because what happens now is that the commit message dialog always has the last commit message in it; this is also after using the editor to resolve merge conflicts, so the message never populates.
Muma David Bwalya
Have you had a chance to check posts above about this issue?
"The issue might be an older message stuck in the Default changelist description, so the message is used now and overrides all others"
Please right click on your changelist, choose "Edit changelist" and see if there is something in 'Comment' field.
Same here. I'm using the modal commit window for this reason.
Dmitriy Smirnov even there is an old message stuck, you can remove it, close the window and reopen it. After that, you can see the classic merge message.