AccuRev Auto Merge of Conflicts

Riyaz Ahmed's picture
Riyaz Ahmed asked on July 15, 2013 - 11:46am | Replies (2).

How do I configure AccuRev so that i can do automatic merge of simple conflicts


In case 2 developers promote the same class but their changes can be easily resolved by AccuRev no action should be required from the developers in order to make more soft the process


2 Answers

Brad Hart's picture
Brad Hart replied on July 26, 2013 - 1:57pm.


AccuRev won't automatically perform a merge when there are two new contributors to a base without the user initiating the action. Inheritance automatically/dynamically merges files downstream when there are no overlaps. In the case of an overlap, the user must initiated this action at the workspace level. Of course, the Merge tool can automatically merge those changes for you, but the initiation of the action comes from the user. 



Riyaz Ahmed's picture

thats cool, thanks Brad

CMCrossroads is a TechWell community.

Through conferences, training, consulting, and online resources, TechWell helps you develop and deliver great software every day.