20

I want to disable Auto-Commit on Merge on Intellij Idea when Branch is merged from Branch Dialog as shown below.

enter image description here

I'm aware that if we use Merge Branch Dialog I have a option for No Commit.

enter image description here

Can I disable auto-commit on merge, when I merge branch from Branch View Dialog?

Aman Tuladhar
  • 7,381
  • 2
  • 30
  • 55
  • I don't see a way within IDEA, but you may want to also look at [defaulting no-commit mode in general](https://stackoverflow.com/q/24660529/65839), which has a couple comments but no actual answer as of this writing. –  Jun 09 '16 at 12:15

2 Answers2

9

While you can't configure it in IDEA itself currently, there is the possibility to set it in your git config. That will affect all git clients including IDEA.

 git config --global merge.commit no
Alim Özdemir
  • 1,944
  • 17
  • 28
  • This doesn't seem to work if I have to resolve merge conflicts. After I resolved the last conflicting file IntelliJ explicitly performs a `git commit` even though I have `merge.commit` set to _no_. – mrArkwright Oct 01 '20 at 08:28
  • You probably still have fast-forward , it circumvents the merge.commit setting. Do an additional `git config --global merge.ff false` – Alim Özdemir Oct 01 '20 at 11:44
5

Using PyCharm follow the steps below, it is pretty much the same on Idea

enter image description here

enter image description here

enter image description here

hevi
  • 1,842
  • 1
  • 26
  • 41
  • OP explicitly said he is aware of this and is additionally asking for "No commit" from the branch view dialog. – Steven Feb 10 '21 at 10:43