|Synchronize with Repository / Conflicts|
A tree conflict is a conflict at the directory tree structure level and occurs when the user runs an update action on a resource that:
The same conflict situation can occur after a merge or a switch action. The action ends with an error and the folder containing the file that is now in the tree conflict state is also marked with a conflict icon.
Such a conflict can be resolved in one of the following ways which are available when the user double clicks on the conflicting resource or when running the Edit conflict action:
Resolve a tree conflict