I work in a branch called master2
, the issue is that I made small changes in 1 file and when I tried to upload them, I made an error and I did git pull origin master
and when doing push
I found almost all the files in the repository with conflict, try to solve them but there was no case. I need to go back to the last stable version of the repository or if it is possible, revert the changes or delete the commits
EDITING
There are 4 commits after which I would like to return, could I get back 4 commits before?