git reset HEAD before checking merge changes

What does happen if i do a git merge from another branch, some conflicts happen, the merge does not get commited, and then i do

git reset --hard HEAD

can i do the merge again? or will git believe that the merge is already done?

---

Your working copy will be reset to the state at HEAD, and no merge will be done. the working copy+index is at the same state is if you never had run git merge .

You can redo the same merge afterwards.

链接地址: http://www.djcxy.com/p/41722.html

上一篇: 樱桃产生的Git冲突

下一篇: 在检查合并更改之前，git重置HEAD