CODEWITHSUNDEEP
gitgit-mergegit-reset
lurscher
lurscher

Reputation: 26943

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?

Upvotes: 3

Views: 4050

Answers (1)

Rudi
Rudi

Reputation: 19940

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.

Upvotes: 5

Related Questions