Info: http://guide.couchdb.org/draft/conflicts.html

a) Start with a very basic model using a revision history to track revisions.

• No conflict resolution performed by server side but only noties clients of conflict.
• Will enable clients to start working

b) Add server side conflict resolution to handle situations where the server can merge/solve conflicts automatically. When not possible it will revert to a, notifying the clients of the conflict and have the client resolve it.