If you are working in a team environment, there will be
certain content and structural conflicts. You can view the potential
conflicts and actual conflicts in the Pending Changes tool
window. Jazz™ source control
clearly displays icons differentiating potential and actual conflicts.
Typically, there are two types of conflicts:
- Content conflict occurs when two or more team members update the
same file.
- Structural conflict occurs when two or more team members move,
rename, or remove a file or a folder.