Environment
Novell iFolder 3.9
Novell iFolder 3.8
Novell iFolder 3.7
Novell iFolder 3.6
Novell iFolder 3.8
Novell iFolder 3.7
Novell iFolder 3.6
Situation
iFolder 3.x environment, with a shared iFolder, what will happen when two people modify the same file at nearly the same time?
Resolution
When iFolder syncs, it happens in sequence, we have a lock on the iFolder, so only one will get updated and other will get an conflict. The first of the sync requests to reach Mono will be the one updated, the other will go to the conflict resolution bin. In such case the user getting the conflict will be given 3 options:
1. Use server copy(overwrite client copy with server)
2. Use Client copy(Sync to server and overwrite server)
3. Save to conflict bin and merge later
The conflict bin location will be given in the message and the user has to manually resolve the conflict and mark the conflict as resolved, so that the new merged file from the client gets uploaded to the server.
1. Use server copy(overwrite client copy with server)
2. Use Client copy(Sync to server and overwrite server)
3. Save to conflict bin and merge later
The conflict bin location will be given in the message and the user has to manually resolve the conflict and mark the conflict as resolved, so that the new merged file from the client gets uploaded to the server.