Git merge issue
Answered
I do follow gitflow so I often need to merge branches. earlier I was using source tree to manage this merging. When I do merge from Source Tree i was getting separate commit added in commit history (with all the commit message included in merge), this is not the case when merging is done from PHPStorm.
Can you please suggest any option/configuration in PHPStorm to have this feature?
Please sign in to leave a comment.
Please check if this thread helps:
https://intellij-support.jetbrains.com/hc/en-us/community/posts/115000331990-how-to-set-up-git-merge-branch-commit-
yes that helps. but it seems like I will have to open that window every time and do the merge with that option checked. is there any global option needs to enable for this, so any merge done from content menu will create new commit?
There is no such an option in the UI.
However, this is default Git behavior, so what you can do is to tell git itself to never use fast-forward merge.