Versions Compared

Old Version 3

changes.mady.by.user Florian Lahr (Unlicensed)

Saved on

compared with

New Version Current

changes.mady.by.user Daniel Maletz (Unlicensed)

Saved on

Key

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


Section


Column
width65%

When working with more than one person on files, there may be situations where there are conflicts during the synchronization. For example if two persons are working on the same file, the last one who saves the file also wins during the synchronization which is triggered as soon as the file is being saved. 

Conflict handling

In the case of a file conflict the client keeps the newest file version (by last modification date) at the original place (e.g. BalanceSheet.xls). All other members of the folder will receive this copy, however will also keep the previous version in

...

their file archive, so nothing should get lost. The overwritten version can

...

be restored from the file archive

...

 then. Furthermore they will get a notification in their client about the conflict and a warning symbol next to the folder in which the conflict happened.


Column


Panel
titleOverview:
Table of Contents



 

Enabling conflict handling

(info)(info) Conflict handling is enabled by default.

...

To disable conflict handling:

  1. Enable the Expert Mode.
  2. Click on Preferences in the main window.
  3. Click on Expert Settings.
  4. Uncheck the Enable conflict handling checkbox.

Resolving conflict on files

This opens the restore wizard which enables users to restore previous file-versions in original location. In addition for situation where users are not certain which version to restore, it is possible to restore previous file-version in an alternative location. 

To restore previous files:

  1. Click on the notification icon (Warnung) in PowerFolder client
  2. Select the conflict problem 
  3. Click on Resolve and Restore Wizard will be displayed
  4. Choose the file-version and the location you wish to restore
  5. Click on Next and finish the process

(Info) If restoring conflicted files is not desired then the conflict notification can be removed by clicking on 'Clean up' button.

(Info) This feature is implemented in PowerFolder version 11 SP 2