Microsoft Corporation
REVERTING MERGES ACROSS BRANCHES

Abstract:

A system for safely reverting merges across branches in version control systems where shared history cannot be rewritten is described. A computer-implemented method, comprising: identifying a first merge base at a trunk, the first merge base merging with a branch of the trunk; identifying, at the branch, a second merge base, subsequent to the first merge base, the second merge base merging with the trunk; forming a merge base patch branch from the branch at the second merge base, the merge base patch branch including a copy of the first merge base; merging the merge base patch branch with the trunk; and merging the merge base patch branch with the branch.