3.12 Resolving File Conflicts

Conflicts can occur between file versions saved at the same time on different computers, or when a filename differs by case only. When conflicts occur, the file is stored in the conflict area and the file is flagged with a status of Name Conflict. The iFolder Error icon iFolder Application Icon is displayed on the iFolder. If the Notify of conflicts option is enabled in your iFolder Preferences, an alert is also sent to the Notification area. You can control the pop-up behavior of Notifications by setting your preference in the iFolder Preferences General tab.

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. In the Notification area, right-click the iFolder application icon iFolder Application Icon , then click iFolders to open the iFolder browser.

  2. Select the iFolder in conflict iFolder Application Icon , then click Resolve to open the Resolve Conflicts dialog box.

  3. 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.

  4. Beneath the version you want to keep, click Save This 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. In the Notification area, right-click the iFolder application icon iFolder Application Icon , then click iFolders to open the iFolder browser.

  2. Select the file in conflict iFolder Application Icon , then click Resolve to open the Resolve Conflicts dialog box.

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

  4. 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 5.
  5. Close the Resolve Conflicts dialog box.

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

  7. 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.

  8. 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.