git 拉取远程最新代码并与本地代码合并

git fetch origin master:tmp
git diff tmp
git merge tmp 
git checkout -d tmp