1. error: Pull is not possible because you have unmerged files.
cause: commit the code before git stash pop.
key: git reset --hard FETCH_HEAD
why: 本地的push和merge会形成MERGE-HEAD(FETCH-HEAD), HEAD(PUSH-HEAD)这样的引用。HEAD代表本地最近成功push后形成的引用。MERGE-HEAD表示成功pull后形成的引用。可以通过MERGE-HEAD或者HEAD来实现类型与svn revet的效果。
2. It looks like git-am is in progress. Cannot rebase.(when git pull --rebase)
key: rm -rf .git/rebase-apply
3. First, rewinding head to replay your work on top of it...(when git pull --rebase)
cause: 回退了版本后没有回到最新
key: git reset --hard origin/<branch>