I am working with a branch
B and I have the branch
Master . I just finished my modifications and I wanted to add them to the Master, but instead of doing this I made a
merge branch 'Master' into 'B' (I put it in English because I do not know how to translate it and why I'm using
I did the commit without solving the problems thinking that I could go back to the previous one and everything would be fine but now I have a lot of conflicts in my source code. Try to go back to the commit before the merge but the changes remain. How can I go back to this commit without the Merge I made of the master?