Menu
I want to get the latest file that's in the repository, and overwrite what I have locally. How can I do this with the git client?
424
Just like git push --force allows overwriting remote branches, git fetch --force (or git pull --force ) allows overwriting local branches.
Force a Checkout You can pass the -f or --force option with the git checkout command to force Git to switch branches, even if you have un-staged changes (in other words, the index of the working tree differs from HEAD ). Basically, it can be used to throw away local changes.
The reason for error messages like these is rather simple: you have local changes that would be overwritten by the incoming new changes that a "git pull" would bring in. For obvious safety reasons, Git will never simply overwrite your changes.
Look at git stash to put all of your local changes into a "stash file" and revert to the last commit. At that point, you can apply your stashed changes, or discard them.
If you want to overwrite only one file:
git fetch git checkout origin/master <filepath> If you want to overwrite all changed files:
git fetch git reset --hard origin/master (This assumes that you're working on master locally and you want the changes on the origin's master - if you're on a branch, substitute that in instead.)
139
Simplest version, assuming you're working on the same branch that the file you want is on:
git checkout path/to/file.
I do this so often that I've got an alias set to gc='git checkout'.
28
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
