git reset HEAD before checking merge changes

Question

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?

see also http://stackoverflow.com/questions/101752/aborting-a-merge-in-git — The Nail, Mar 01 '12 at 21:34

score 5 · Accepted Answer · answered Mar 01 '12 at 21:30

5

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.

answered Mar 01 '12 at 21:30

Rudi

19,366
3
55
77

git reset HEAD before checking merge changes

1 Answers1