Conflicts

A conflict is a save that changed on this device and on another one since the two last agreed. Say you played offline on a handheld, then played the same game on your desktop before the handheld reconnected. Neither save is more right than the other, so RomMBat does not choose.

Nothing is overwritten while a conflict is open. Both saves are kept, and that save stops syncing until you decide. The main menu's Conflicts row counts how many are waiting.

Choose a side

1. Choose Conflicts on the main menu, and open the save.
2. The screen shows which save it is, such as Battery save or Memory card, when the conflict was found, the save on this device, and the save on the server with when it last changed.
3. Press Accept, then choose This device's or The server's. Decide later is selected first.
4. Confirm.

Keeping this device's save sends it to RomM, and every other device takes it from there. RomM keeps the save it had as an earlier version, so that side is not lost.

Keeping the server's save downloads it, checks it and puts it in place. This device's save never reached RomM, so RomMBat keeps it in emulators/rommbat/replaced/ under a dated name: the copy set aside when the conflict was found, and a second one taken just before the server's save goes in, if you played on since or if the save is a folder, such as a PSP game's. Nothing removes those copies, so to go back to that save, copy it over the game's save while the game is closed.

Choosing needs the server. Keeping the server's save is refused while that game is open, so quit the game first; the conflict waits.

From a terminal

rommbat-agent saves lists open conflicts, and rommbat-agent saves resolve settles one with --keep-local or --keep-server. See Command line.