So we've gotten a git branch into a tricky state:
Last week someone accidentally merged other_branch (prematurely) onto master and pushed to origin. We noticed the error and I, in my naivete, committed
git revert bad_merge_commit
to "fix" the problem. Everything looked ok, we moved on with our lives...
Today we attempted to merge master into other_branch as a step towards bringing other_branch into master. But my revert seems to have caused a nightmare. When master merges into other_branch, all (most?) of the work on other_branch is deleted. I presume this is because my revert instructs all the older commits to be reverted.
There are of course now many days' worth of commits on master on top of my revert, so untangling this looks like it may be difficult.
Is there some way to repair the damage? Can I perhaps reach in with some rebasing argument and delete the two offending commits?
[Update - adding detail of current state as requested]
other_branch was branched off of master quite some time ago. Our standard practice is to merge master repeatedly into other_branch as we go to minimize buildup of conflicts (sometimes we rebase, but not in this case).
master commits A | B | C | BAD_MERGE [other_branch_@S] | REVERT_OF_BAD | D | E | F ... HEAD
other_branch commits P | Q | R | S [BAD_MERGE_FROM_HERE] | T | U | V ... HEAD
Attempt to merge master HEAD to other_branch HEAD causes problem.
Charles, I'm currently attempting a fix on a duplicate of master using the solution you suggested here: Git: removing selected commits from repository