The topic you requested is included in another documentation set. For convenience, it's displayed below. Choose Switch to see the topic in its original location.
Resolving Folder Differences and File Conflicts
The following section contains topics that describe how to solve the conflicts that can occur between server versions of folders and files and versions that have pending changes in your local workspace.
Branching and Merging
Provides information about branching and merging team projects.
Compare Two Folders
Describes how to compare two server folders, two local folders, or a server folder and a local folder.
Compare Two Files
Describes how to view the differences between two server files, two local files, or a server file and a local file.
( 1500 characters remaining)
Thank you for your feedback