Comment by npteljes

Ah, right, then maybe I didn't see the point after all. Nextcloud handles this quite well though, I think, it will say, on the phone, that there is a conflict between the two versions of the file, and in case of images, it ever shows them side by side, and asks you what to do.