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
Moving commits to another branch in Git
Publish Date：2025/04/01 Views：200 Category：Git
-
Git is a very useful and powerful tool in the modern software world. Many types of files and codes can be stored through branches and commits in Git. Branches are a different concept depending on the version control system you use. Many dev
Git push using SSH keys
Publish Date：2025/04/01 Views：94 Category：Git
-
SSH stands for Secure Shell. It is the key that provides us with the credentials to access the SSH network protocol. It provides access to remote servers between engines on an unsecured open network. It is used for transferring data, files,
Delete commits but keep changes in Git
Publish Date：2025/04/01 Views：179 Category：Git
-
This article outlines the steps necessary to undo a Git commit while preserving the changes introduced by the same commit. We'll cover two commands we can use that have the same effect. Without further ado, let’s jump right in. Remove com
Different ways to commit untracked files in Git
Publish Date：2025/04/01 Views：198 Category：Git
-
This article discusses the different methods we can use to commit untracked files in Git. If you introduce new files in your project in Git, these files will fall under the category of untracked files. With respect to the Git version contro
Git add all but one file to commit
Publish Date：2025/04/01 Views：73 Category：Git
-
This article explains how to add all files to commit while excluding selected files. This comes in handy when you have many files to include in a commit and must leave out one file. Instead of adding files one at a time, you can follow thes
Git exits the commit message editor
Publish Date：2025/04/01 Views：91 Category：Git
-
This article outlines the steps to exit the commit message editor in Git. When you merge or make a commit in Git, the console prompts you to provide a commit message that briefly describes the new commit. Git opens your default text editor,
git add, git commit and git push are combined into one command
Publish Date：2025/04/01 Views：142 Category：Git
-
This article discussed two methods that you can use to add, commit, and push files to a remote repository with a single command. When making small changes to a single file, you still need to follow the three-stage process of publishing chan
Git Add and Git Commit merged into one command
Publish Date：2025/04/01 Views：184 Category：Git
-
This article discusses combining the git add and git commit commands into one command line. Combining the two commands into one can save you time. When combining these two commands, you have to keep in mind what you are committing to. Let's
Git list commits
Publish Date：2025/04/01 Views：66 Category：Git
-
Git is the most common, free and open source distributed version control system. It has repositories that play an important role in the Git world. As a result of this feature of Git, repositories hold a huge significance in the life of deve
