Home / Questions / 89988
Accepted
g3rv4
Asked: 2020-07-24 17:51:58 +0800 CST 2020-07-24 17:51:58 +0800 CST

How can I git pull after a history change on the remote?

  • 772

If another developer made a change to the history of gitand then did git push -f, git pullit doesn't work for me.

How can I fetch the changes from the remote?

git

1 Answers

  1. Best Answer

    Translated from git pull after forced update

    The first step is to receive all the commits that are in the remote, for that do

    git fetch

    I assume we are talking about master. If not, replace masterwith the name of the branch you are working with.

    Reset

    To point the local branches to the same commit that is on the remote, you have to use git reset.

    If you don't mind losing your local changes:

    git reset origin/master --hard

    This will undo all your changes and bring back the same thing that is on the remote. From now on, git pushand git pullthey will work as usual.

    If you want to keep your changes local:

    Instead of a hard reset, do a soft reset

    git reset origin/master --soft

    You can apply your local commits on top of what's on the remote usinggit rebase

    git rebase -i origin/master

    This will run an rebaseinteractive mode, where you can choose how to apply your local commits that are not on the remote above the HEADcurrent one.

    If the changes in the history deleted any commit that you have local, they will appear as commits pending to be applied again. If you don't want them to be applied, you'll have to delete them as part of the rebase.

    Use git command --helpfor more details and examples of how to apply any of these commands.

    • 9