[ptone]

I think you should send feedback and ask for a merge feature.

In theory the hard part is all done with the syncing code.

You should hypothetically be able to do this.

Sync your work copy to a server

in OF, restore from backup and choose a home OF backup file

Click sync again

it could just work at this point, or OF could throw up a dialog that asks you to choose between server, local, and merge. I'm pretty sure there would be no object ID conflicts, but you could end up with some duplicate contexts.

Note I'm not suggesting you try this, it won't work, but I think its a good feature request.

-P