git 如何解决 (master|MERGING) git reset --hard head //回退版本信息 git pull origin master 转载于:https://www.cnblogs.com/651434092qq/p/11018868.html