您的位置:首页 > 其它

You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can me

2014-06-28 14:42 471 查看
============================================================博文原创,转载请声明出处电子咖啡-专注于移动互联网
============================================================
You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge.

1) Undo the merge and pull again.

To undo a merge:

git merge --abort [Since git version 1.7.4]

git reset --merge [prior git versions]

2) Resolve the conflict.

3) Don’t forget to add and commit the merge.

4) git pull now should work fine.
内容来自用户分享和网络整理,不保证内容的准确性,如有侵权内容,可联系管理员处理 点击这里给我发消息
标签: 
相关文章推荐