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 merge --abort
git reset --merge
合并后记得一定要提交这个本地的合并（add-->commit-->push-->pull）
然后在获取线上仓库
git pull
