Official comment
It is best to manage conflicting versions from the web interface to get things set the way you want them. To avoid conflicting versions, try not to leave files open on multiple systems as that's the most common way conflicting versions occur.
Comment actions