git reset操做：回滾pull和merge

回滾merge和pull操做  引用 $ git pull                         (1)  Auto-merging nitfol  CONFLICT (content): Merge conflict in nitfol  Automatic merge failed; fix conflicts and then commit the result.  $  git

>>阅读原文<<