Up and Running with Git

Merge Conflicts

Sometimes when we merge branches there are conflicts that Git can't resolve. Conflicts are a normal part of Git but it's important to know how to handle them.