• Skip navigation
  • Skip to navigation
  • Skip to the bottom
Simulate organization breadcrumb open Simulate organization breadcrumb close
FAUbox
  • FAUTo the central FAU website
Suche öffnen
  • Deutsch
  • Campo
  • StudOn
  • FAUdir
  • Jobs
  • Map
  • Help

FAUbox

Navigation Navigation close
  • FAUbox Documentation
    • Glossary
    • FAUbox Account Lifecycle
    • FAUbox Features
    • Desktop Client Guide
      • Installing on Windows
      • Installing on macOS
      • Installing on Linux
      • Users Guide
      • Troubleshooting
    • Cloud Guide
      • Getting started
      • Users guide
    • FAUbox Mobile Apps
      • Working with the FAUbox on an Android device
      • Working with the FAUbox on an iOS device
    • Known issues
    • FAUbox-Extensions
      • Storage capacity expansion
      • Setting up a ‘Function’ FAUbox
      • FAUbox Add-Ons
    • Projects with external partners
    • Support for congresses
    • Security and Privacy
    • PowerFolder Outlook Add-In Guide
    Portal FAUbox Documentation
  • How-to articles
  • FAQs
  • FAUbox Hotline
  • FAUbox
  • Folder management
  1. Home
  2. Desktop Client Guide
  3. Users Guide
  4. Configuring Client Settings
  5. Configuring Conflict Handling

Configuring Conflict Handling

In page navigation: Desktop Client Guide
  • Client Log Files
  • Installation Guide
  • Troubleshooting
  • Users Guide
    • A quick glance over the desktop client
    • Accepting/ Declining a Folder Invitation
    • Accessing FAUbox folders via WebDAV
    • Configuring Client Settings
      • Configuring Conflict Handling
      • Configuring DynDNS
      • Configuring the Settings of the Synchronization Pause
      • Configuring the Transfer Mode
      • Configuring Warnings and Notifications
      • Enabling Expert Mode
      • File Archive Configuration
      • Network Configuration
      • Optimizing the Client Performance
      • Starting minimized
    • Configuring the Folder Basepath
    • Creating a top-level Folder via Client
    • Deleting a Toplevel Folder via Client
    • Editing Folders and Files via the File System
    • Excluding Files or Directories
    • Getting started
    • Managing folder members
    • Moving the Folder Basepath of the FAUbox Client
    • Reading the Synchronization Status via File System
    • Restoring File Versions
    • Running as a Windows System Service
    • Secure Files with End-to-End Encryption (E2EE) using Cryptomator
    • Sharing Folders and Files via Client
    • Stopping the Folder Synchronization
    • Synchronizing a shared folder
    • Using command line parameters

Configuring Conflict Handling

When working with multiple people on the same file, it is possible for synchronization conflicts to occur in certain situations. For example: If two people are working on the same file, the one to save the file last will ‘win’ the synchronization process. In this case the client saves the newest file version (the one with the latest modification date) as the current file, while the previous file version, which was overwritten, is saved in the file archive and can be restored later on. Furthermore the folder members receive a notification in their clients whenever a file conflict occurs and a warning sign appears next to the toplevel folder that contains the respective file.

 

1. To enable the Conflict Handling:

The conflict handling is enabled by default but in case you have manually disabled the conflict handling in the past and want to reactivate it, you have to proceed as follows:

  1. Click on Preferences in the main window.
  2. Open the tab Expert Settings.
  3. Check the checkbox called Enable conflict handling.
  4. Click on OK.
  5. Done! You have successfully enabled the conflict handling.

 

2. To Disable the Conflict Handling:

If you disable the conflict handling, the client will no longer issue a warning and the overwritten file will not be saved in the file archive (therefore it can’t be restored later on!).

  1. Click on Preferences in the main window.
  2. Open the tab Expert Settings.
  3. Uncheck the checkbox called Enable conflict handling.
  4. Click on OK.
  5. Done! You have successfully disabled the conflict handling.

 

Regionales Rechenzentrum Erlangen
Martensstraße 1
91058 Erlangen
  • Imprint
  • Privacy
  • Accessibility
  • Facebook
  • RSS Feed
  • Twitter
Up