...
Enabling conflict handling
Conflict handling is enabled by default.
...
- Enable the Expert Mode.
- Click on Preferences in the main window.
- Click on Expert Settings.
- 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:
- Click on the notification icon
in PowerFolder client - Select the conflict problem
- Click on Resolve and Restore Wizard will be displayed
- Choose the file-version and the location you wish to restore
- Click on Next and finish the process
If restoring conflicted files is not desired then the conflict notification can be removed by clicking on 'Clean up' button.
This feature is implemented in PowerFolder version 11 SP 2