What if I have a file conflict?

A person can decide to upload a new version of a file while another person is editing the file online or has saved an online file that is not yet published. The new uploaded version is stored in Files as its own version number, and you are warned of the conflict the next time you try to edit the file from the Files list.

About this task

When you are warned of a file conflict, take one of the following actions:

Procedure

  • Open the new version.
    You can open the new uploaded version with assurance that you can analyze the changes in the other file later if you need to.
    1. Click Open New Version. The new file is automatically published as its own version in Files.
    2. If you are sure that the new uploaded version is official, continue editing.
    3. If you prefer to reconcile the two versions manually, close the document. From the view file page, click the Versions icon in the sidebar. Download the two versions to your computer, copy the missing changes into one of the versions, and then upload that version as the latest.
  • Open the other file.
    1. To open the other file, click Cancel in the File Conflict window.
    2. If you are sure that this file is official, continue editing. Click File > Publish Now when you are finished editing. Make sure that you add the change summary in the Publish window so that you can later distinguish versions on the sidebar.
    3. If you prefer to reconcile the two versions manually, save this file as its own version by clicking File > Publish Now. Then, from the view files page, click the Versions icon in the sidebar, download the two versions to your computer, copy the missing changes into one of the versions, and upload that version as the latest.