RDoc-192 Document auto conflict resolution (remote vs local)