With fear and trepidation, you opened Scrivener on your iPhone. You’re in the middle of the document you’d been editing all day — and none of your iPad changes were there. You closed the project, your automatic sync started . . .
And you got the dreaded “Conflicted Files” warning. When you tapped away the alert, a nasty yellow “Conflicts” folder appeared in your project.
None of your words have disappeared. You will need to spend a few minutes checking the versions of your file with each other, and manually merging changes. That’s all. If you have Scrivener for Mac/PC, try this:
On each iOS device:
- Get to your projects screen inside Scrivener.
- Manually tap the Sync icon.
- Quit the app. (Double-click the Home button to reveal the app gallery, and slide Scrivener up to remove it from the gallery.)
You should have a “Conflicts” folder on each of those devices in the conflicted project — perhaps more than one. No worries, we’re on our way.
On your Mac/PC:
- Open the project that’s conflicted. It will update, show another alert about conflicts, and then that (those) yellow folder(s) will show up. Go ahead and open a Conflicts folder, now that you’re sure that your iDevices are not hiding un-synced changes.
- Dig down inside the Conflicts folder if you need to, to find the actual file shown as conflicted. Don’t open that right away.
- In your Binder, find the “original” file. Open it in the Editor. This is the version that Scrivener thinks is the best version. Make a snapshot of it.
- Go back to the version in the Conflicts folder. Choose Edit > Select All. Choose Edit > Copy.
- Back in the Binder version, Choose Edit > Select All. Choose Edit > Paste.
- In the Snapshots pane, click the Compare button. Walk through your changes by using the arrow buttons in the Snapshots pane. Correct the Binder copy as needed.
- Repeat Steps 2 through 6 for every file in the Conflicts folder(s). You may have to do it more than once for the same Binder file, in order to pick up both iPad and iPhone changes.
Now that you have your changes incorporated, move your Conflicts folder(s) to the Trash — you no longer need them. Delete them from the Trash, as keeping them around could cause conflict detection to get confused. Quit Mac/PC Scrivener.
Back on your iOS device(s), just to be sure, go to the Settings app. Tap Scrivener > Reset Scrivener > Clear Dropbox Sync Cache. When you start iOS Scrivener again and sync, Scrivener will rebuild its date comparison information to be sure that all the dates everywhere agree.
In rare cases, you may get repeated sync warnings on iOS and continued creation of conflict folders, despite having followed the directions above. This rare event may happen if you use Scrivener on two iOS devices. If this happens to you:
- Don’t proceed with sync!
- Quit Scrivener on both iOS devices as described above.
- Open the project in Mac/PC Scrivener and make sure it’s correct. Follow the above process if needed.
- Make a backup outside the Dropbox sync folder.
- Quit Mac/PC Scrivener.
- In Finder, or File Explorer, move the original project out of the Dropbox sync folder.
- Back in iOS, open Scrivener and manually sync your projects. If the conflicted project reappears, tap
Editabove the Binder, select the offending project, and tap
Delete. Keep doing this until the project is completely gone on both iOS devices.
- Back on your Mac/PC, and still in Finder or File Explorer, move the original project back to your Dropbox sync folder.
Now you may safely sync your iOS devices to get the clean project. If it’s a large project, be sure you’re on a good connection, preferably WiFi. Or, transfer it via iTunes this once.
Next up: iOS-only conflict resolution.