Abort a merge in Git

David Y.
jump to solution

The Problem

How can I abort a merge in Git and return my repository to its previous state?

The Solution

We can use the git merge command to abort a merge:

git merge --abort

Alternatively, we can use git reset --hard HEAD or git reset --merge, which will achieve the same thing.

Note that the presence of merge conflicts does not mean that we have to abort the merge. To successfully resolve the conflicts and complete the merge, see our answer about merge conflicts in Git.

Fix "detached HEAD" in Git
David Y.
Fetch a remote branch in Git
David Y.
Resolve merge conflicts in Git
David Y.
Undo the most recent local Git commits
David Y.

Considered "not bad" by 4 million developers and more than 150,000 organizations worldwide, Sentry provides code-level observability to many of the world's best-known companies like Disney, Peloton, Cloudflare, Eventbrite, Slack, Supercell, and Rockstar Games. Each month we process billions of exceptions from the most popular products on the internet.

Sentry