In a local repository, I have accidentally merged two branches. How do I undo this? I have not yet pushed the changes.
If the merge has not yet been committed – i.e. git merge
was not run with the --commit
flag and git commit
has not been run since the merge – then we can abort the merge with the following command:
git merge --abort
If the merge has been committed, we must use git reset
instead:
git reset --merge ORIG_HEAD
git reset
is used to return the current branch to a previous state. The --merge
flag will ensure that changes made to files by the merge are reverted, but will preserve changes that have not yet been included in any commit, preventing us from losing uncommitted work.
ORIG_HEAD
refers to the state of the repository before the merge operation. Per the documentation, this reference is created when running commands that make drastic changes to a repository’s state, such as git merge
, to provide an easy way for the user to undo them.
Even if the merge we’ve just undone has been pushed to a branch on any of our repository’s remotes, we can use the --force
flag the next time we push to rewrite its history:
git push origin my-branch --force
Loved by over 4 million developers and more than 90,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.