git合并代码时的报错
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决方法：
1、放弃本地更改
git reset --hard origin/master
2、保留本地更改
git merge --abort
git reset --merge
版权声明：本文为weixin_43196880原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。