CODEWITHSUNDEEP
gitgithub
alaslipknot
alaslipknot

Reputation: 561

Github Desktop reverting is not possible because you have unmerged files

Am pretty new to using Git (currently using Github Desktop for my unity project) and i thought everything was going fine since i was committing and pushing daily, yesterday i upgraded the project to a newer unity version, but now i regret that, so i just wanted to come back to this commit:

enter image description here

but whenever i choose "revert this commit", it shows me this error:

enter image description here

and in the changes window there are two conflicts which i also have no idea what caused them or how to fix them:

enter image description here

I went through similar questions to mine but most answers says "fix the conflict", the problem is that i don't what did i conflicted, nor how to fix it

Upvotes: 1

Views: 3780

Answers (1)

Shradha
Shradha

Reputation: 2442

Open git terminal and run the following command-

git reset --hard {Your commit hash}

It will move the HEAD back to where you want to be. Commit hash looks like - "4a155e5".

Upvotes: 8

Related Questions