How do I set --no-ff to be the default?
已回答
I've just moved to a new company and when I set up IDEA it wasn't doing merges with --no-ff by default like in my other setup.
It just always fast-forwards which isn't what I want.
I can't find any option to set the default merge options either.
For reference I merge using the branch button in the bottom right and not via the menu that allows you to choose which method you want to use each time
How do I configure the default merge option?
请先登录再写评论。
Unfortunately, it is not possible to set the default merge option right now. We have a feature request for that: https://youtrack.jetbrains.com/issue/IJPL-84802. Feel free to [vote](https://www.jetbrains.com/help/youtrack/server/vote-for-issues.html) for it and [follow](https://www.jetbrains.com/help/youtrack/server/vote-for-issues.html#subscribe-to-updates-when-you-vote-for-issue) for progress updates. Unfortunately, it is pretty old.
Currently, it is possible to choose the
--no-ffoption in the main menu > Git > Merge.. action as you mentioned.Also, as a workaround you can try configuring it in your repository config file:
I must have done it on the command line at my last job since I'm the last comment on that issue with the command!