About resolving conflicts

When merging folders, you must resolve all the conflicts before saving the target folder. To resolve conflicts, you can do one of the following:

• Manually select the item revisions in the derivative or ancestor that you want to include in the target folder.

• Start the Serena Merge Tool to resolve conflicts between the selected files.

Back to top