Skip to content

Instantly share code, notes, and snippets.

@gpassarelli

gpassarelli/git_stash

Created January 20, 2015 19:35
Show Gist options
  • Save gpassarelli/2662fdc3ee15b35558a1 to your computer and use it in GitHub Desktop.
Save gpassarelli/2662fdc3ee15b35558a1 to your computer and use it in GitHub Desktop.
Download ZIP
Ignoring “Your local changes to the following files would be overwritten by merge” on pull
Raw
gistfile1.txt
#Git - force a pull to overwrite everything, on every pull
git fetch origin master
git reset --hard FETCH_HEAD
git clean -df
Raw
git_stash
#If you want remove all local changes from your working copy, simply stash them:
git stash save --keep-index;
#If you don't need them anymore, you now can drop that stash:
git stash drop;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment