Error merging: fatal: You have not concluded your merge (MERGE_HEAD exists).

錯誤：Error merging: fatal: You have not concluded your merge (MERGE_HEAD exists). 解決方案1：保留你本地的修改(推薦) git merge --abort git reset --merge 合併後記得一定要提交這個本地的合併 然後在獲取線上倉庫 git pull 解決方案2：down下線上代碼版本,拋棄本地的修改 gi

>>阅读原文<<