Anyone know a proper git workflow in that i can minimize conflicts?
#Unity git workflow
young tulip
When i and a friend want to merge commits and it happens that we both changed something in a scene resolving said conflict is a pain in the a**
any tips or best practices?
noble raft
-
Use a proper git ignore
-
Use prefabs everywhere so you're only editing them and not objects directly in the scene
-
Minimize cross object referencing as those are scene changes
-
Communicate who's owning what so you avoid conflicts. If someone is going to be lighting the scene, then work on something else, or track what you're doing so you know what to redo (again using prefabs)
brave jackal
Also set up Unity smart merge, which has a better understanding of Unity yaml than the default text merge does
young tulip
tysm for the tips @noble raft
another thing i should rethink about our current workflow is that we have our seperate branches just for the sake of not being in each others way
so we litereally have 1 branch each and when we feel like it we merge into main
needless to say this isnt optimal at all
do you recommend only using feature branches merging whenever the feature is finished, or are there better ways to approach this (I assume this is part of a basic git workflow anyway)
ty @brave jackal