Skip to content

Resolve conflicts

Conflicts occur when local changes exist but a newer server version is checked out.

In this case:

  • Local changes are moved to the backup directory ({Drive}:\vdClientArchive\{Project}\{Project.$b$}).
  • The server version replaces the working directory.
  • No workflow step is active until the conflict is resolved

Figure: Workspace, Conflicts view

Procedure

  1. Select the View conflict button to compare versions.
  2. Select Mark as resolved.

The server version remains, and the Edit step is activated.

Related topics