Guest Posted November 10, 2007 Report Share Posted November 10, 2007 Hello! I1m currently evaluating Plastic SCM and I would like to know in which cases merge tool resolves automatically the conflicts. I hope your answer. Thanks Elena Link to comment Share on other sites More sharing options...
danipen Posted November 10, 2007 Report Share Posted November 10, 2007 Hello Elena, Plastic SCM can be configure to have different behaviros when it found a merge conflict. You can configure the merge with the following values: onlyone - Will be an automatic merge if only one contributor modified the item (whole) onlysrc - Will be an automatic merge if only source contributor modified the item (whole) onlydst - Will be an automatic merge if only destination contributor modified the item (whole) try - Will be an automatic merge if only one contributor has modified a the conflictive piece of code (each conflict) forced - Always try to solve all no automatic conflicts When two developers have changed the same codelines whith different changes, you have to solve these conflict manually. Daniel Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.