Sync issue between TVOS and MacOS

[Gandulf78]

First and foremost consider this:

• Only RetroArch bugs should be filed here. Not core bugs or game bugs
• This is not a forum or a help section, this is strictly developer oriented

Description

Coud sync is set up on webdav server on TVOS and and MacOS. Sync on TVOS is ok, no error during synchronisation. After starting RetroArch on MacOS, the following message appear "CloudSync finished with conflicts". Cloud sync finished with conflicts.

Expected behavior

Synchronisation is ok and I can retrieve my saves from TVOS on MacOS.

Actual behavior

Synchronisation fails and the saves on MacOS are not synced with CloudSync.

Steps to reproduce the bug

1. Playing on GoldenAxe Warrior on TVOS
2. Opening RetroArch on MacOS message "CloudSync finished with conflicts" Error in the log file: [WARN] [CloudSync] conflicting change of saves/x.srm [INFO] [CloudSync] fetching states/x.state1 [INFO] [CloudSync] successfully fetched states/x.state1 [INFO] [CloudSync] finished processing manifests [INFO] [CloudSync] wrote /Users/laurent/Library/Application Support/RetroArch/downloads/manifest.local

Bisect Results

[Try to bisect and tell us when this started happening]

Version/Commit

You can find this information under Information/System Information

• RetroArch: [version/commit] MacOS Version 1.19.0

Environment information

• OS: [The operating system you're running] MacOS 14.5
• Compiler: [In case you are running local builds]

[warmenhoven]

Conflicts are a normal part of cloud sync and not a bug. RetroArch does not make any effort to resolve the conflict automatically (intentionally). When a conflict happens, you must manually resolve the conflict (currently outside retroarch, which is a possible future improvement) by choosing to keep either the local or server copy.

• If you would like to apply the server copy, simply delete the local copy and resync.
• If you would like to keep the local copy and overwrite the server copy, you have a couple choices:
  • Copy the filename and hash from downloads/manifest.server into downloads/manifest.local
  • Move the file to a temporary location, sync and get the sever version, move the file back overwriting the server version, resync

[Gandulf78]

Ok thanks for the feedback. It was not obvious that sync was to be resolved manually. It is exactly what I have done: delete the local files on MacOS and resync. Then I have no conflict on MacOS anymore. When I come back to TVOS I get a sync conflict, which is weird because I didn't touch the WebDAV version intentionally. I will fix it manually too.