Video Course

Get to Know Git: Lesson 13 of 14

Merge Conflicts

Up Next

Reverting Commits

Autoplaying in 7 seconds!

Cancel

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.

Chris Sevilleja

162 posts

Co-founder of Scotch.io. Slapping the keyboard until something good happens.