問題: $ git status -s
MM myfile
$ git stash save
$ git show [email protected]{0}
# Only shows unstaged changes NOT staged changes
# To debug:
$ GIT_TRACE=2 git stash show
trace: exec: 'git-stash
當我試圖拉從origin/master的一些變化,我收到此錯誤: error: Your local changes to the following files would be overwritten by merge ,因爲我做了局部修改。我不想犯這些變化,所以我想我應該在我的分支使用git stash,然後git pull origin master 我的問題是: 將拉動簡單地忽略的變化,