JIYIK CN >

This article explains how we can revert the changes made to the mastergit pull origin <branch> branch after running the command . Assume that you have a master branch and a feature branch in your local and remote repositories .

You pull changes from the remote feature branch to your local repository, but notice that you have it checked out in your local master branch.

How do you revert changes made to the master branch and pull the changes to the feature branch?

Git Pull OriginOverwrite the Master branch

To understand this concept, let's replicate the scenario illustrated above.

Assuming that there are changes in our remote feature branch that are not present in our local repository, we will run git pullthe command as shown below to merge the changes into our local repository.

$ git pull origin feature

请注意, we are still checked out in the master branch, but ideally we want to bring the changes from the remote feature branch to the local feature branch. Note that the above operation will transfer all commits from the remote branch to the local master branch and create a merge commit.

How can we revert our master branch to its previous state and merge the changes into our local feature branch?

We will start by restoring the master branch. At this point we will use git reset --hardthe command.

We can reset our master branch in two ways using the command.

We can use git reset --hardthe pull command on the parent commit. A parent commit is simply the commit that existed before the merge commit that was produced by the pull.

Run git log --onelinethe command and note the SHA-1 of the parent commit . Remember which commits were introduced from the remote branch.

To reset the master branch, run the following command.

$ git reset --hard 11bd00c

This will reset our master branch to the state it was in before the pull. Alternatively, you can use the HEAD reference.

In this case, we would run the following command:

$ git reset --hard HEAD~1

The command above is the safest option as working with commits can be confusing, especially if the pull pulls in multiple commits. We can now move on to our local feature branch.

$ git checkout feature

We know that git pullthe command combines the git fetchand git merge FETCH_HEADcommands. This means that we already have changes from the remote feature branch, but they have not yet been merged into our feature branch.

We do not need to run the git pull origin feature command again. Instead, we can merge the changes as shown below.

$ git merge FETCH_HEAD

This will update our local feature branch to match the remote feature branch.

In summary, if git pull origin <branch>the command incorrectly updates your master branch, you can revert the changes and move them to the correct branch as described above. The above method applies to all branches.