Git alternative for Unity?

Question

git

We use git in the unity project. But at the same time, we cannot work on one stage at the same time, since this is always fraught with conflicts, and not readable for a person. Just a question - how do they usually work in large (and not very teams)? We just announce in the workspace that the scene is occupied by something. but I don't think it's the only way to work.

Answer 1

This is not a git question, but a question of choosing a utility for merge. See what the Unity developers themselves have to offer

Answer 2

There is plastic scm - its developers give a strong emphasis on Unity and there is a special mode for artists.
And it also has a semantic merge that takes into account the syntax of the language and allows you to automatically resolve some conflicts (for example, when moving code and renaming)

Answer 3

I answer the question in the header: there is an alternative, for example, the same Mercurial .
In general, work in different branches, and then merge and do not forget about the pull request, and then you will be happy)