Convergent Scalar Merge

Convergent scalar merge is a ScalarMerge algorithm based on the property that if A and B are merged and A has an ancestor whose history is isomorphic to B's history, then A should win. It's similar to MarkMerge, and can be thought of as the scalar version of PreciseCodevilleMerge (in fact, they were developed in tandem).

attachment: ConvergentScalarMerge.py

Strengths

• supports Convergence
• handles StaircaseMerge
• has a conceptually simple motivation

Weaknesses

• doesn't support ImplicitUndo

Used by

• Will be used by Codeville

Related

• MarkMerge

CategoryMergeAlgorithm