Skip to content

Resolving conflicts

A conflict can arise if you make changes to the component locally without checking it in and check out a new version of the component from the server.

If there is a conflict, the local changes are moved to the component's backup directory ({Drive}:\vdClientArchive\{Project}\{Project.$b$}) and the current server version is copied to the local computer.

The view for resolving conflicts is displayed in the workspace. No work step is activated in the navigation bar, as you must first resolve the conflict before you can continue editing the component.

Figure: Workspace, Conflicts view

  1. Click on the View conflict button to view the differences between the working directory and the local backup.
  2. Click on the Mark as resolved button.
  3. The server version in the working directory is retained. The view Edit is displayed in the navigation bar, you can continue to edit the project data.