On Thu, Jul 03, 2008 at 04:15:22PM -0400, Avery Pennarun wrote:
Unfortunately, since your mismerged branches are already published, rewriting history would cause a lot of pain for everyone. It would be better to avoid doing that entirely. However, I can see why you'd want to do that in order to make future git-bisect easier.
It's only sitting in a private developer's branch. I want to do the merge properly, but I'm just trying to figure out how to get the conflict resolution out of his work.
Basically, if you're going to try to fix the git-bisect intermediate versions, you're going to have to rewrite history anyway; in which case, why not just make your developer's cherry-picked branch the official one? Then your problems are solved, other than getting all your developers onto the new history.
Once we start cherry picking the changes from Company B, we have a different set of changes from them, and future merges will get harder and harder.
This will apply the correct conflict resolution to the tip of your newest branch. All the revisions between X and HEAD will still be broken, but that's usually better than trying to rewrite history and pretend the broken revisions never existed. You can always use "git bisect skip" for cases like that.
Except we already know that the broken change is inside of the broken revisions. It turns out that things are more messed up than I thought. This developer had done a 'git push' with some manual refs and pushed what was supposed to be a merge into an unmerged branch. I've spoken with all of the developers who use this tree, and everyone agrees that rewinding the tree is the best way to go. Now just time to trudge forward and learn. But, it makes for a good new rule: no cherry-picking other people's changes. David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
