报错内容:
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决方法(放弃本地修改):
git reset --hard origin/master
注:代码更新为何远程分支最新版本代码一致
报错内容:
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决方法(放弃本地修改):
git reset --hard origin/master
注:代码更新为何远程分支最新版本代码一致