因此,我们已经得到了一个Git分支成一个棘手的状态:Git的合并,然后还原,然后还原的还原
两个分支:
* master
* other_branch
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?
Many thanks!
[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 [[email protected]] | 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: How to remove selected commit log entries from a Git repository while keeping their changes? .
[/Update]
你能状态(最好带有挑逗性图片)到底是什么状态你现在在吗?修复它不应该太困难,但听起来您可能需要修复损坏,这会导致我的第一个(最近)尝试将'master'合并到'other_branch',如果这被提交并推送。 – 2011-03-24 07:46:04