1. 我認為這是正確的做法：

git fetch --all
git reset --hard origin/master

git reset --hard HEAD
git pull

git reset --hard HEAD
git clean -f -d
git pull

git clean

 git add *
 git commit -a -m "auto dev server commit"

 git fetch origin master
 git merge -s recursive -X theirs origin/master

git fetch --all
git reset --hard origin/master

git fetch origin
git reset --hard origin/master

git checkout <your-branch> -f

git clean -f

git clean -fd

git stash --include-untracked
git pull

$ git stash list
[email protected]{0}: WIP on <branch>: ...
[email protected]{1}: WIP on <branch>: ...
$ git stash drop [email protected]{0}
$ git stash drop [email protected]{1}

$ git stash clear

$ git stash list
...
$ git stash apply [email protected]{5}

git reset --hard HEAD~5

git pull

# Fetch the newest code 
git fetch 
# Delete all files which are being added, so there 
# are no conflicts with untracked files 
for file in `git diff HEAD..origin/master --name-status | awk '/^A/ {print $2}'`
do
 rm -f -- "$file"
done
# Checkout all files which were locally modified
for file in `git diff --name-status | awk '/^[CDMRTUX]/ {print $2}'`
do
 git checkout -- "$file"
done
# Finally pull all the changes (you could merge as well e.g. 'merge origin/master') 
git pull 

git reset --hard HEAD
git clean -f
git pull