Change flow, conflict detection, and conflict resolution

When two or more team members modify the same file or folder, conflicts result. These conflicts must be resolved when one team member accepts the other's changes into a workspace. Rational Team Concert™ source control detects potential conflicts and warns you about them before you accept them. It also provides a variety of tools and methods for resolving conflicts.

Conflicts typically arise when the same file or folder is modified in two different workspaces. (Because Rational Team Concert source control does not have an explicit checkout operation that declares intent to modify a resource, you are not warned if you start to modify a resource that is being modified elsewhere.) Conflicts can even arise within a single workspace if you suspend a change set, modify one of the files it contains, and then resume work on the change set.

There are two types of conflicts:

Rational Team Concert source control detects potential conflicts in incoming or outgoing change sets and makes them visible in the Pending Changes view. Resolution of potential conflicts in incoming change sets can be avoided or postponed if you want. Potential conflicts in outgoing change sets must be resolved, usually by accepting and resolving the conflicts in an incoming change set, before the change set can be delivered.


Feedback