Change flow, conflict detection, and conflict resolution

When two or more team members modify the same file or folder, conflicts happen. These conflicts must be resolved when one team member accepts changes into a workspace from other team members. Engineering Workflow Management source control detects potential conflicts and warns you about them before you accept them. It also provides various tools and methods for resolving conflicts.

Conflicts typically arise when the same file or folder is modified in two different workspaces. 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. If artifacts are difficult to merge, you can lock the artifact in the target stream before you modify it. Other users cannot modify the artifact until the lock is released. When an artifact is locked, only the owner of the lock can deliver changes to that artifact.

There are two types of conflicts:
  • Content conflicts occur when incoming and outgoing change sets include changes to the same file. Typically, this happens because another team member has modified the file while you were modifying it.
  • Structural conflicts occur when incoming and outgoing change sets include changes to the same directory namespace, usually the result of moving, removing, or renaming files or folders in a directory.

Engineering Workflow Management 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.