But on teams it was just a god damn headache (don't get me started on the last company I worked at who tried taking a 20 year long team of Microsoft developers and throwing them into git all blind. Sure, on a loan project where all you had was your self to blame for stuff it was fine. Working on teams with people of disparate skill levels made git a god damn nightmare. I hated the damn thing because it was so NOT user friendly. I won't like if you asked me 10 years ago about git, I spat on it. It srsly is SO NICE compared to TFS on so many levels.

Now that tools like SourceTree are so user friendly, we've finally migrated to Git. Though honestly in terms of Unity projects. At first we used TFS because the GUI wrappers for Git back then just weren't 'artist friendly' (they really relied on you having advanced skills like a programmer would have, or were terminal based). We also used Team Foundation Server for a while before migrating to Git. You might want to just add a 'icon' editor to any files marked readonly so that it shows a little 'lock' icon next to it in the editor. I just tested, if you edit a scene or anything marked readonly. You just gotta check for when a file is edited (check the local repo for diff information, or even unity might have a hook for when a file becomes 'dirty') and send the lock request to the remote repo and mark the file readonly on the local filesystem. Honestly you could probably write a few editor scripts to handle this. If you do this, you can then layer whatever features on top of it that you'd like.Īs for unity integration in and of itself. For example, we self host our repo internally, and anyone remote from the server (not on the LAN that where I have the server located) can VPN in to access it as a remote repo. You don't need to use something like bitbucket to share your repo. This is usually a feature not of git in and of itself, and is usually respective to the git repo you're using. Usually by setting up push permissions on a file/directory level and using git tracking to track a 'remote' repositories permission settings and flag the local repository based on it. With that said, people have tacked on the ability in various methods. The idea is as Kurt described, you have a distributed repository. We use git, it's great, and if you have unity in full text mode file merges are super easy (for the most part).Īs for the file locking thing.

Git lfs lock