Home 
Resources CM Yellow Pages Articles and Whitepapers CM Crossroads Articles A Trustworthy 3-Way Merge
Resources CM Yellow Pages Articles and Whitepapers CM Crossroads Articles A Trustworthy 3-Way Merge
A Trustworthy 3-Way Merge
Address
Bill Ritcher patrick.egan@cmcrossroads.com
By Bill Ritcher
SCM systems supporting concurrent development models have existed for a long time. Today, more than ever, concurrent development is crucial to productivity. Any paradigm supporting concurrent development depends upon a trustworthy 3-way merge.
Although 3-way merge tools have been available for a long time, their trustworthiness has been insufficient for a long time as well. This results in development environments with: a) concurrency forbidden, b) "gotta-do-a-merge" blues, and/or c) additional CM staff to manually review all merge results. All of these alternatives are productivity killers and feed the black hole where all theoretical ROI goes.
This paper describes an advanced 3-way merge solution. First, it discusses the many problems that have plagued 3-way merge implementations -- test case kits are provided to detect their existence. Then, it shows how solutions for these problems were designed and implemented in a working product.
Reviews (0)
Be the first to review this listing!