LFS introduces a very helpful concept called "file locking" (Docs here and here. It is akin to the "checkout" feature in Perforce (not to confuse with checkout in Git which doesn't mean the same thing at all). Basically, you can "lock" a file, so you only are able to push it in the remote repo.
As a professional game dev myself, it was used a lot in the previous studios I worked in. It can be annoying, but it's really helpful for editing for example game levels. I know tscn files are text-based and should be suitable for merging, but in practice, unresolvable dependy errors often arise, which brings development to a halt.
The integration should be similar to Unreal Engine's Perforce integration, which means :
When saving a "lockable" filetype, a popup appears asking you tick the file(s) that you want to lock. You cannot save a file if you haven't locked it. If it is already locked, it shows you who locked it
Locked files are shown in the file browser with a little icon. A separate panel could be used to list all locally locked files.
If you want to save a locked file locally for testing purposes, you can do it. In Unreal it's called "save as writable". Such files should also be indicated in the file browser. Their changes will be overwritten when pulling from the remote repo if the file has been pushed.
There could be a dialog asking you what to do with such files when pulling. Either overwrite, or move your changes to a duplicate that you can then manually merge or integrate in the project.
Tricky thing is, if an asset is referenced in a scene and that asset is changed, Unreal Engine will mark it as saved and will ask you to check it out. I do not know how Godot handles this.
I would very much like to bring this feature to the project with a pull request.
LFS introduces a very helpful concept called "file locking" (Docs here and here. It is akin to the "checkout" feature in Perforce (not to confuse with checkout in Git which doesn't mean the same thing at all). Basically, you can "lock" a file, so you only are able to push it in the remote repo.
As a professional game dev myself, it was used a lot in the previous studios I worked in. It can be annoying, but it's really helpful for editing for example game levels. I know tscn files are text-based and should be suitable for merging, but in practice, unresolvable dependy errors often arise, which brings development to a halt.
The integration should be similar to Unreal Engine's Perforce integration, which means :
Tricky thing is, if an asset is referenced in a scene and that asset is changed, Unreal Engine will mark it as saved and will ask you to check it out. I do not know how Godot handles this.
I would very much like to bring this feature to the project with a pull request.
Mockups
Save Popup
File browser
Pull Popup