Any better way to handle conflicts from SAMBA/SMB share?

Hi,

I have a Nextcloud install linked to a Samba share. I have tested various scenarios and Nextcloud handles it great when multiple users edit the same file/upload at different times, however, if you take a text file as an example and edit it from the nextcloud GUI at the same time as someone saves it directly to the samba share, the changes are lost/there is no conflict file created.

Is there anyway round this other than not allowing access to the web interface for the users?

Samba supports file locking (https://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/locking.html). I found a discussion on github which hints a bit in this direction:
https://github.com/nextcloud/server/issues/1016

@icewind can you comment on this?