/
NoW 365 oFS - How to resolve file conflicts in FileCloud Sync (macOS)

NoW 365 oFS - How to resolve file conflicts in FileCloud Sync (macOS)

FileCloud Sync, macOS 10.14 and above

Updated on: Nov 21, 2025

Overview

How to resolve file conflicts warnings and errors in FileCloud Sync for macOS

Scope of This How To Article

This how to guide applies to FileCloud Sync, macOS 15.7

Prerequisites and Requirements

  • macOS

  • FileCloud Sync for MAC that is currently running and connected to the Internet

Notes

  • oneFileSync (Powered by FileCloud) is a part of the NoW 365 Digital Workspace

Additional Notes (must Read)

About Conflict Files

  • When two or more users update the same file with the same name at roughly the same time, a file conflict can occur.
    When this happens, it must be resolved.

  • A conflicted file will be tagged with “(Conflict)” as part of its file name.

    The file tagged with “(Conflict)” is usually the version stored on the FileCloud server or the version containing changes made by the other user(s).
    In some rare cases, the “(Conflict)” tag may appear on the local version instead.

  • Important:
    It is not recommended to manually delete or remove the duplicate/conflicted file using macOS Finder.
    Always use the Finder → FileCloud extended context menu to resolve the conflict. This process will be demonstrated in this guide.

  • Backup Reminder:
    Before resolving the conflict, always create a backup (make a copy) of the version you want to keep—just in case.

 

This guide (For demo purposes) is based on the following scenario: FileCloud has detected a file conflict that must be fixed or resolved.

  1. Two users are involved:

    • One in Edmonton

    • One in Calgary

  2. Both users are signed in to FileCloud Sync using the same user account.
    Side note: This is not recommended practice for several reasons, including security, auditing, and file-conflict risks.

  3. The Edmonton user, on a Mac using FileCloud Sync, makes changes to a file/document.

  4. The Calgary user, on Windows using FileCloud Sync, also makes changes to the same file/document at the same time.

    At this point, both users—sharing the same FileCloud account—are editing the same file simultaneously.

  5. The Calgary (Windows) user saves their changes first, and the file syncs successfully to the FileCloud server.

  6. The Edmonton (Mac) user then saves their changes and attempts to sync the file to the FileCloud server.

  7. The Mac user receives a Conflict error, because the version on the server has already been updated by the Windows user.

  8. The Mac user wants to keep their version of the file because they believe the changes made by the Windows user are incorrect.

Step 1.0 - Resolve File Conflict

Sub-Step #

Instruction

Screenshot

Sub-Step #

Instruction

Screenshot

 

We will now demonstrate how to resolve a conflict file warning on a MAC based on the above scenario.

image-20251121-064135.png

 

1.1

Locate the FileCloud Sync icon on the macOS menu bar.

image-20251121-064253.png

 

 

1.2

  1. Click the Icon once

  2. Select Open

image-20251121-064221.png

 

 

1.3

For this demo, the error status indicator points to a File that has a conflict which must be resolved.

We are going to confirm the conflict, and the file location first

 

Click the Error Tag

image-20251119-222712.png

 

1.4

For this demo, there is only 1 file with a conflict status.

image-20251121-023511.png

 

 

1.5

We will now open the folder with the conflicted files

  1. Locate the file with the conflict that you would like to resolve, and click the …

  2. Click Open Location

image-20251121-023437.png

 

 

1.6

MAC Finder will open the folder where the readme conflicted files are located.

As per demo, there are two readme files with the same name except for the one tagged with (conflict_2025-11…1-48)

We will now determine which copy we want to keep.

image-20251121-023623.png

 

1.7

Open the file with the “(Conflict)” tag.

As we can see, this version was edited by the Windows user.

For this demonstration, we do not want to keep the README file edited by the Windows user. We want to keep the version modified by the user on this Mac because it contains the correct information.

We now know that the README file with the “(Conflict)” tag is the version we want to discard.

Close the conflicted file and proceed to the next step.

image-20251121-024144.png

 

1.8

  • Open the file without the “(Conflict)” tag.

    This is the version edited by the Mac user.

    For this example, we will assume that this is the correct version of the file, and that the changes made by the Windows user are incorrect.

    Based on this, we now know that the file without the “(Conflict)” tag is the version we want to keep.

    Close the file and proceed to the next step.

image-20251121-024445.png

 

1.9

Since we are keeping the README file without the “(Conflict)” tag, we will resolve the conflict by discarding the other version of the file.

This is also a good time to communicate with the other user to let them know that their version will be discarded.

You may also want to back up (make a copy of) both files and place them in a temporary folderon your Desktop. Backing up is optional, but recommended.


Do not create the backup copies inside the same FileCloud folder.

 

After backing up, close the backup folder to avoid any confusion.

You can now proceed to the next step.

image-20251121-030412.png

 

1.10

  1. Right click the file that you want to keep

  2. Click Resolve Conflict

image-20251121-030805.png

 

1.11

  1. Confirm to make sure the version of the file you want to keep is the one that is selected

  2. Click Resolve

image-20251121-031308.png

 

1.12

Your last chance to confirm. Click Yes when ready or no to bail out

image-20251121-031708.png

 

1.13

At this point

  • The version changed by the other user has been discarded.

  • The version edited on this MAC (The one you want to keep) has been synced up to the server.

  • May be this is a good time to let the other user know that the version of the file they updated is now gone.

  • Optional: Open the file to make sure the content is the version that you want to keep.

image-20251121-031753.png

 

1.14

Note:

When the user on the windows Computer opens the same file on their system, they will see the changes made by the mac user instead.

image-20251121-032731.png

 

1.15

If you made a temporary backup to your files, perhaps it is a good time to discard to avoid confusion.

 

 

1.16

Please note that this scenario can also occur in reverse—where the Mac user saves the file first and the Windows user’s version is the correct one. In that case, the Windows user would need to follow the same process to resolve the file conflict.

 

The changes documented above are specific to the NIRIX Shared Hosting Environment only.

Related Articles

Related articles appear here based on the labels you select. Click to edit the macro and add or change labels.

There are no related labels.