Abort Git Merge in PhpStorm

Question

Situation:

1. Merged a branch
2. Made a mistake while merging.
3. I need to abort the merge and start over.

I previously used Tower for Mac to manage my git repository. I'm trying to make the switch to using PhpStorm to manage my git repo but it seems to be missing some features.

In Tower there is an "Abort" button which allows me to easily undo my messed up merge and start over. Simply click the "Abort" button and it reverts everything perfectly like you never even started the merge.

Tower for Mac Abort Merge Button

Question:

Is there a simple way to abort/undo a merge in PhpStorm?

Answer 1

GUI

In new versions of phpStorm use the function "Git" -> "Abort Merge". In old versions use "VCS" -> "Git" -> "Reset Head" and choose the "Hard" option.

You will lose all changes, so be careful.

CLI

git merge --abort

Answer 2

If you only want to undo the changes to a single file somefile then you can try the following:

git checkout -- path/to/somefile

In case you want to undo the entire merge operation, then git reset will come in handy:

git reset --hard HEAD

Both of these operations are resetting the state to the HEAD of the branch, which is the last commit made before you attemtped a merge.