Resolving Conflicts

When you update your project suite bound to the Subversion source control with changes from your Subversion repository, a conflict may occur.

If you do not use the TortoiseSVN client, TestComplete will show an error message notifying you about the problem.

If you use the TortoiseSVN client, the Update dialog will show you information on any conflicts occurred during the update.

Resolve the conflicts directly from the Update dialog.

As an alternative, you can close the Update dialog and resolve the conflicts later. TestComplete will mark the conflicting project items in the Project Explorer with the icon.

1. Select File > Source Control > Resolve from the TestComplete main menu.

   – or –

   Right-click your project suite in the Project Explorer and then click Source Control > Resolve.

   – or –

   Click Resolve Conflicts on the Source Control toolbar (if the toolbar is hidden, right-click the toolbar area and then click Source Control).

2. TestComplete will open TortoiseSVN Resolve dialog. The dialog shows the list of all conflicted files in your project.

3. Resolve the conflicts and close the dialog.

   

– or –

1. Open the TortoiseSVN Check for Modification dialog. To do this, click Show Changes on the Source Control toolbar or select Source Control > Show Changes from the TestComplete main menu.

2. The dialog shows the list of local changes in your project suite. Conflicting files will be highlighted in red.

3. Resolve the conflicts and close the dialog.

   

   Click the image to enlarge it.

For instructions on how to resolve conflicts, see TortoiseSVN documentation.

Related Tasks

See Also

Integration With Subversion - Common Tasks
Integration With Subversion
Getting Changes From the Repository