git 解决 push 时(master|MERGING)

执行git reset --hard head

git push origin master