Git Product home page Git Product logo

Comments (2)

warmenhoven avatar warmenhoven commented on July 17, 2024

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

from retroarch.

Gandulf78 avatar Gandulf78 commented on July 17, 2024

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.

from retroarch.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.