成功实践
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决办法
git fetch --all 检查冲突
git reset --hard 分支名
git pull
成功实践
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决办法
git fetch --all 检查冲突
git reset --hard 分支名
git pull