View Full Version : [SOLVED] git revert?

04-21-2016, 11:10 AM
Hey guys, i was trying to like, import a few feutures from rochet, when i accidently added reforge,
I'm not in need of this, and i would like to revert the changes, how would i do this if i have the command line still opened?
My current view : https://gyazo.com/e3cf9fe51832d1286ac0727e6cbd3630

I would like to undo the reforge pull, thanks in advance.

04-21-2016, 02:48 PM
It says the git pull failed.
This means that a git merge is in process and there are conflicts.
You can abort the merge (and thus the whole git pull, or at least the merge part of it) with
git merge --abort

I myself have never reverted a successful merge. However you should be able to do that by using git reset --hard <commit hash of the top commit before merging>
Locating the needed commit hash might be difficult though. Likely it is named like "merged transmog to master" or something like that though.