https://github.com/xianxianhaifeng
git 如何解决 (master|MERGING)
git reset --hard head //回退版本信息
git pull origin master
