Terms!

• textual merger, content merger: a merge algorithm that operates on text files (as opposed to, for instance a tree merger or scalar merger)
• pcdv merge (or just pcdv): see precise codeville merge
• precise codeville merge: a textual merge algorithm,
• suturing:
• implicit undo:
• convergence: The idea that if the "same change" is made independently at different places in a graph, then a merge algorithm should treat the two changes as if they were a single change.
• Example:

                 a
                / 
               b   b
               |
               c

a convergent merge algorithm will make this a clean merge to c.

 Create your own business wiki!Support CommunityPublic, Platinum wiki Privacy Policy RSS