howto use "No Fast Forward" flag when merging branches in git with IDEA
git, intellij-idea, merge
Solution
Just go to VCS - Git - Merge Changes, and on the following dialog tick "No fast forward":
Problem
I am using Idea 13.0.2 and I want to merge my 'feature' branch in the 'develop' branch with the "--no-ff" flag. If from Idea, I checkout the "develop" branch and invoke the "merge" operation (all this from the "Git Branches" popup), the actual merge command executed by Idea is: ``` git merge feature/f4 ``` I'd like it to be ``` git merge feature/f4 --no-ff ``` I have search a way to add this flag in Idea. The documentation reference a 'Merge Branches Dialog' https://www.jetbrains.com/idea/webhelp/merge-branches-dialog.html with such a check box, but I have not been able to get it. Thanks for your help