Merge Conflicting Files page
Use the Merge Conflicting Files page to view the files that are in conflict as a result of the update, and to resolve them using the Serena Merge Tool.
|Rules and guidelines
The file name and revision number of the file in conflict.
Select the row and click the Merge button to open the Serena Merge Tool and resolve the conflict in content.
See the online help in the Serena Merge Tool for details of how to perform the merge.