4
Take a look at my commits chart: https://github.com/danieldspx/cni/network
I took a dump here, I wanted to merge the Workspace branch with the master. The Workspace is the one that was more current, then I wanted to pass pro master and delete the Workspace branch. Just that I went to try to merge and while trying to resolve the conflict of a file I forgot to remove the section:
<<<<<<<< HEAD
{Codigo...}
======
{Codigo...}
>>>>>> origin/workspace
I tried to do a revert for before the merge. I got so much that it’s my last commit. However, I can’t merge this last commit with the latest Workspace commit. He says it’s already up-to-date. I understand I’m committed to the front of Workspace , but it’s because I fucked up. How do I fix this?
git merge --abort
?– Jefferson Quesado