How to "abort" merge in IntelliJ Idea

Question

Let's say I am merging and just before the push I decide that I do not want to merge. Is it possible to get rid of the commits I have merged (and not pushed yet) without deleting my local branch or going into command line?

Choose your case [from here](https://www.jetbrains.com/help/idea/undo-changes.html). — harrymc, Jan 18 '18 at 08:58

Olivier Gérardin · Answer 1 · 2019-11-22T13:31:19.417

32

In the latest versions of IntelliJ (and I suppose other JetBrains products) there is a new option in the "Git branches" menu (bottom right of the screen) conveniently named "Abort Merge"...

edited Nov 22 '19 at 13:31

answered Aug 28 '19 at 10:05

Olivier Gérardin

420
4
6

1

This also works for most things with conflicts like reverts that result in needing a merge. – royalaid Feb 25 '20 at 05:43
This wasn't in the Git Branches for me, but in the Git menu. – Philipp Nov 11 '21 at 13:20

score 21 · Accepted Answer · answered May 17 '18 at 20:42

Happened to me while getting both push and pull failures:

"Push to origin/master was rejected"
"You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge"

To resolve:

Go to "Version Control" window --> "Log" tab.
Right click the previous commit --> "Reset Current Branch to Here..."
In Git reset select "Mixed" (it keeps local changes).
If there are later commits that were already pushed --> Pull from remote and merge as required.
Commit the new changes, and Push to remote.

How to "abort" merge in IntelliJ Idea

2 Answers2