Mastering Unity 2017 Game Development with C# - Second Edition

Conflicts and resolving

Branches in Git are especially useful whenever two coders need to work from the same base or core code, but they must take the project in new directions by adding specific features to the original work or by amending the existing work. To do this, each coder works on a separate branch, and their changes are merged back into the main branch to integrate their work together later. This workflow is very powerful because it means different coders can work in isolation on their own branch, without affecting each other. However, a problem arises with this approach logistically. Specifically, what happens if the coders take the project in different and contradictory directions and then try to merge those changes together? ...