Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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.