Get to Know Git

Merge Conflicts

When git has trouble merging, it will create a merge conflict. This doesn't mean that it destroys code, it means that it will show the two conflicting sections of code right next to each other.

This is a very handy feature as it forces you as the developer to go in and review the conflict.