Hi,
I want to revert a merge because instead of using git merge -s recursive -X ours, I've used git merge -s ours.
I've read this blog post about reverting merges, but it doesn't seem to work for my case.
So, I have the master branch, and then the topic branch. At some point I merged master into topic, and then merged topic into master. When I merged master into branch, I had a conflict on a file, but I figured it didn't do anything important so I thought I say git to skip it, and use my version. That's when I used git merge -s ours, instead of git merge -s recursive -X ours, which I found out today that it ignored everything one of my team mates did.
Now, I'm trying to revert this merge:
git checkout master
git revert -m 2 c475f0ac
This is indeed bringing in the tree the changes ignored in my merge (my team mate's changes). The problem is that now, my changes are no more in the tree. I've tried reverting the revert, but no success.
Any suggestion on how to revert such a merge?