koobas.hobune.stream
How do you properly use git with a Unity project?
I'm working in a larger team, and we constantly have merge conflicts in multiple meta files, almost every time we pull or merge.
Much like this topic, we are also getting conflicts with the "timeCreated" variable (as well as other things), which keeps changing. From the other topic, I gather that it is changed every time a script changes some user data, which is a lot...
Is there something we can do to avoid these conflicts? I've basically done nothing today but help my teammates with solving conflicts..
We're using the following .gitignore, which seems pretty standard:
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
# Autogenerated VS/MD solution and project files
ExportedObj/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.DS_Store
# Unity3D generated meta files
*.pidb.meta
# Unity3D Generated File On Crash Reports
sysinfo.txt
# Builds
*.apk
*.unitypackage
#Wwise
Assets/Wwise/Editor/ProjectData/*
in your "Project Settings" > "Editor", "Version Control" is set to "Visible $$anonymous$$eta Files"?
Sorry, yes. Version Control is set to "Visible $$anonymous$$eta Files", and Asset Serialization $$anonymous$$ode is set to "Force Text"
From my googling, out settings shouldn't be the problem, hence I'm at a loss..
I'd say Unity's project files are just unsuitable for GIT. And as they want to sell their Collaborate service, i doubt they're going to change that.
I'd really like to hear from $$anonymous$$ms who work with more than 2 people on a Unity project, how they manage to do that.
