Detecting conflicts

A conflict is a potential issue with your configuration. Conflict detection is a way to check that your project contains the configuration you requested.

Conflict detection identifies when only part of a change is included in your configuration. It helps ensure that if you include a particular change (as defined by a task), it includes all of the change.

Note: Remember, conflicts are potential issues. Not every conflict is a bad thing. Whether you want to be notified about certain conflicts depends on how your software development team works.

For example, after you update your project, then show conflicts, you receive a conflict warning because you have an object that is associated with multiple tasks. Your team rewrites a program to fix multiple problems in that program. In this case, an object that is associated with multiple tasks is fine for your organization. You can turn off such conflict notifications so that you are informed of the conflicts you want to resolve.

Use conflict detection to perform an operation that tells you if your configuration is missing part of a change or includes an unexpected change.

The next several sections show how to find conflicts, what causes potential issues, and how to resolve issue. Such topics help you decide which conflicts you want to be notified about.

A conflict arises when there is a difference between the update properties for the project and the project members. The relationships Rational® Synergy uses to detect conflicts include:

Update your projects immediately before showing the conflicts for a project or projects. If the update properties for a project change after it is updated, conflicts are shown for discrepancies between the update properties for the project and the project members. Therefore, showing conflicts immediately after updating the update properties for the project minimizes the chance of additional conflicts.


Feedback