Source control strategies for small team

Source control question- We use git right now for a samll team (just 2 so far) but haven’t been able to figure out a proper workflow to avoid merge conflitcs when 2 developers are working on the same project.
UE5 apparently has this sorted out, ie multiple people can work on the exact same level or map but until then what is the solution?

The solution, unfortunately, is to not work on the same file at the same time.

Other VCS solve this differently than Git, like Perforce (EPIC uses that internally, I think) which locks a file for everyone else as long as you’re using it. But since Git is a distributed VCS, that doesn’t really work.

Your best bet might be to keep your work domains separated well enough so that only one of you has the “authority” over certain types of assets.

1 Like