Thank you all for your input and specifics on the use case - keep them coming!
Here is a little bit of background on the decision to only support automatic conflict resolution in 2.0 .
As Jim and Jens alluded to, Custom conflict resolution is definitely on our radar - we are carefully weighing the pros and cons of various approaches to determine the best way forward.
Will keep folks posted as we have more specifics.