>>292629739
Unlike unity collab, git conflicts don't have to be resolved right away; you have both your local repo and remote repo, I have a separate local repo/remoyte repo, and can pull changes and resolve then rather than needing to resolve them immediately. Stuff like "duplicating a prefab to keep the old one as backup" happens implicitly in the process of commiting the new version. It's a weird way of thinking about version control at first, but it works quite well once you get the hang of it. 

You may find github's guides useful https://guides.github.com/introduction/git-handbook/ though they're centered on the command line; I think the only guides for github unity plugin are in https://github.com/github-for-unity/Unity/tree/master/docs/using and in videos on youtube.