Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Expand
titleHow Do I Resolve a Conflict?

You can resolve the conflict by deleting the file that you don't want any more.

To view all the conflicting files:

  1. On the Activity screen, in Filter, use the drop-down to select either Errors
  2. Double click the entry to open up a dialog that will help resolve the conflict.
Image Removed
  1. Image Added

For example, if you want to use the file in the server and discard local changes, select "Resolve Conflict using Remote Server Copy" and click on "Resolve" button.

...