转自:https://stackoverflow.com/questions/10414769/git-pull-keeping-local-changes
There is a simple solution based on Git stash. Stash everything that you’ve changed, pull all the new stuff, apply your stash.
git stash
git pull
git stash pop
转自:https://stackoverflow.com/questions/10414769/git-pull-keeping-local-changes
There is a simple solution based on Git stash. Stash everything that you’ve changed, pull all the new stuff, apply your stash.
git stash
git pull
git stash pop