Get to Know Git: Lesson 13 of 14 Merge Conflicts Chris Sevilleja (@chrisoncode) Up Next Reverting Commits Autoplaying in 7 seconds! Cancel Join Scotch School Enroll today for access to all premium content! Sign Up Login Chris Sevilleja Follow @chrisoncode ⏲ 4:35 📑 Bookmark ✅ Mark as Complete Next: Reverting Commits WTable of Contentshen 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.