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.
I just did git pull origin branch accidentally and now I have all these changes merged into master
I tried reverting the commit w/ github for mac and got this error:
fatal: Commit d0fbfb0f7d3ea8.. is a merge but no -m option was given.
Assuming you have not committed anything on top,
git reset --hard HEAD^will do what you want.HEAD^refers to the first parent of the current commit, which is the one you want to reset back to.A “hard reset” will set the current branch and the work tree to point to whatever you tell it to, discarding anything else (notably uncommitted changes). This is a BIG hammer, so be careful.