Git Undo Merge
In this article, we will see how to undo a merge in Git.
In Git, we merge one branch with another to integrate the changes from the other branch into the current branch HEAD.
Sometimes, we may want to undo such a merge. We can use the Git command git resetto undo git merge.
We will now illustrate this with an example.
git resetUndo merge
in Git using
Suppose we merge a branch i.e. feature1with mainthe branch to integrate the changes from this branch into mainthe branch.
Now, we decide to undo this merge. We can use for this git reset.
First, we need to find the merge from Git's log commit sha. To do this, we can use git logthe command.
We will execute git logthe command as follows.
$ git log --oneline
0e25143 Merge branch 'feature1'
23ad9ad Add the initial code base
We can see 0e25143that is merged from feature1branch to mainbranch commit sha. is committed before 23ad9admerging branch .feature1commit sha
We will use the command with --hardthe -m option to reset the branch to its pre-merge state.git resetmain
git resetThe syntax of the command is as follows.
git reset --hard commit_sha_before_merge
We will now execute git resetas follows.
$ git reset --hard 23ad9ad
So, we have now undone the merge (i.e.) reset our current branch HEADto mainthe commit before the merge.
请注意, after executing the git reset command given above , any uncommitted changes or unstashed changes will be lost.
We can also use git resetthe command as follows, especially if the last commit was a merge.
$ git reset --hard HEAD~1
It resets the current branch by a single commit HEAD.
We can do the same.
$ git reset --hard ORIG_HEAD
ORIG_HEADPoints to the commit before the merge took place.
A safer option is to use --mergethe option with git reset, as shown below.
$ git reset --merge ORIG_HEAD
git resetThe -p option of the command --mergecauses the index to be reset and files that differ between commit and to be updated HEAD; but it preserves changes to files that differ between the index and the working tree (that is, changes that have not yet been added to the index).
For reprinting, please send an email to 1244347461@qq.com for approval. After obtaining the author's consent, kindly include the source as a link.
Related Articles
Git installation and establishment of local warehouse service
Publish Date：2025/04/05 Views：89 Category：Git
-
Git is a distributed version control system: the client does not only extract the latest version of the file snapshot, but also completely mirrors the original code repository. It has the following advantages: a. Since every extraction oper
git remote operation——multiple remote repositories for one project
Publish Date：2025/04/05 Views：131 Category：Git
-
Multiple remote repositories for a git project In our git project, the command to operate the remote repository information is $ git remote # 查看当前所有的远程仓库的名称 $ git remote -v # 查看远程仓库的名称和远程仓
Git cherry pick command usage
Publish Date：2025/04/05 Views：190 Category：Git
-
git cherry-pick is a powerful command that allows us to select an arbitrary Git commit by reference and attach it to the HEAD of the current working branch. Cherry picking is the act of picking a commit from one branch and applying it to an
Comparison between Git merge and Git rebase
Publish Date：2025/04/05 Views：171 Category：Git
-
The git rebase command may seem like Git wizardry to beginners, but if used carefully, it can actually make life easier for your development team. In this article, we compare git rebase with the related git merge command and identify all th
How to fix Git error Error: src refspec master does not match any
Publish Date：2025/04/05 Views：124 Category：Git
-
When using Git, we may encounter the error "src refspace master does not match any". Here's what the error means and how to fix it. What does src refspec master does not match any Mean in Git mean? We may encounter this error when we try to
Rebase local branch when pulling changes from remote repository branch in Git
Publish Date：2025/04/05 Views：144 Category：Git
-
This article will cover the basics of rebasing your local branch when pulling changes from a remote repository branch in Git. We use the version control system Git to track changes made to files. We commit changes in a local branch in our l
Undo Git Stash
Publish Date：2025/04/04 Views：187 Category：Git
-
This article explains how to make and save changes to a repository. Git allows you to save changes locally and push them to a server when needed. In Git, we don't use the term save , but commit . We use git add , git commit , and git stash
View a list of cache entries in Git
Publish Date：2025/04/04 Views：59 Category：Git
-
We often need to pause our work and focus on something else in our development environment. Therefore, we may need to temporarily save our current work and focus on a different one. We may want to resume our original work later. git stash T
Git stores specific files
Publish Date：2025/04/04 Views：115 Category：Git
-
This article will cover storing changes to only specific files in Git. In Git, when we make some changes in our working tree, we may have some changes which may or may not be staged in our local repo. We may now wish to save these changes f
