Resolving File Conflicts

When conflicts occur between file versions saved at the same time or when a filename differs by case only, the file is flagged as a Name Conflict and is stored in the conflict area and an alert is sent to flag the file through the iFolder client.


Version Conflicts

Version conflicts should be coordinated with other members before resolving the conflict. Then choose the correct version in the Conflict Resolution dialog.

  1. When a conflict occurs, a pop-up message appears in the Notification area. Click the X to dismiss the message.

    You can disable the pop-up behavior by setting the preference in the iFolder Preferences > General tab.

  2. In the Notification area, right-click the iFolder icon iFolder Application Icon, then click iFolders to open the iFolders browser.

  3. Select the file in conflict, then click Resolve Conflicts Resolution Icon to view the Resolve Conflicts dialog box.

  4. View the information for the file on your local machine and the file on the server to determine which version of the file you want to keep, then click Save This Version to keep the correct file version.

  5. When you are done resolving the conflict, click OK.


Filename Conflicts

Filename conflicts occur when the names of the local file version and the server file version differ by case. The content might differ, or it might be the same. These type of conflicts can be resolved by renaming the files, but be careful about where you rename the file.

  1. When a conflict occurs, a pop-up message appears in the Notification area. Click the X to dismiss the message.

  2. In the Notification area, right-click the iFolder icon iFolder Application Icon, then click iFolders to open the iFolders browser.

  3. Select the file in conflict, then click Resolve Conflicts Resolution Icon to view the Resolve Conflicts dialog box.

  4. Confirm that it is a file name conflict and determine whether the content is the same or different.

  5. Do one of the following:

    • If the content is the same, rename one of the files, then click Save This Version, then click OK to close the Resolve Conflicts dialog box. You are done.
    • If the content is different, continue with Step 6.
  6. Close the Resolve Conflicts dialog box.

  7. Open a file manager and navigate to the local copy of the file in conflict.

  8. Copy the file and save it with a unique name in the iFolder.

    iFolder synchronizes the file as a new file to the server and member computers.

  9. Return to the Resolve Conflicts dialog box, select the server version of the file, click Save this Version, then click OK.

    The server version of the file downloads to your local machine and overwrites the local copy of the file by that name.