有时候在拉取库的时候遇到: git-----You have not concluded your merge (MERGE_HEAD exists) 解决方法: git merge --abort git pull --rebase