Mistake done in commit

QBox Workspace
#1

sir i have mistakelny commited the wrong merge conflit what should i do now

fatal: There is no merge to abort (MERGE_HEAD missing).

#2

Hey @Akansha22 if you have commited wrong merge conflict then here is the solution by reset of your directory

  1. by using command git log check all the commit hash which you have made and try to find out till which commit you want to restore your repo ( if you want to find out the difference between two commits use command git diff HASH1 HASH2 or git show ) copy hash value of that commit.

2 then use command git reset --hard <hash_value> to go back on particular commit

  1. the you can make correction in mistake which you have done earlier by getting correct merge conflict
#3