JIYIK CN >

In this tutorial, we will learn how to force pull changes from a remote repository in Git.

Sometimes, we may need to discard local modifications and replace them with updates from a remote repository in a collaborative development environment.

We use git pullthe command to fetch changes from the remote repository to the local branch in the local repository.

git pullThe command will succeed only if the changes in your local branch are behind the changes in the remote repository .

If the changes in the local branch and the remote repository diverge, if we want to discard the local changes, we need to force to git pulloverwrite the local changes,

We will now explain this in detail with an example.

Force pull of remote changes in Git using git fetch, , git resetandgit merge

git pullA command is not a single operation. git pullA command runs commands, i.e. git fetchfetches data from a remote repository, and then a command git mergemerges those changes into your local repository.

So git pullthe command runs these two commands as follows.

$ git fetch
$ git merge origin/$CURRENT_BRANCH

git fetchThe command downloads the latest changes from the remote repository. It does not make any changes to the local 合并repository 变基.

The command given above git mergemerges changes from the remote repository, origingiven by the alias , into the local branch $CURRENT_BRANCHin the local repository that are not yet present in the local branch.

Therefore, if the local branch in your local repository is different from the branch in the remote repository, this git pullwill fail.

We may have made some local changes to the files in our working tree of our local branch. Hence, this will cause git pullfailure.

We might now decide to discard our local changes in favor of changes in the remote repository.

Therefore, we need to force pull the changes which will overwrite the local modifications.

We need to do the following to force pull remote changes.

$ git fetch
$ git reset --hard HEAD
$ git merge origin/$CURRENT_BRANCH

The command with --hardthe -fetch option git resetwill reset the branch to what we just fetched. It will also discard any local changes to tracked files, and will remove untracked files.

Therefore, use with caution as any local changes will be lost.

Alternatively, we can save our local changes before pulling them in. We can use git stashstash changes along with the pull of changes.

We can do this.

$ git fetch
$ git stash
$ git merge origin/$CURRENT_BRANCH
$ git stash pop

Therefore, when we use git stash, we no longer need to execute it on the local branch of the local repository git reset.

We use git stash popto fetch local changes from storage.