Handling and Preventing Merge Conflicts in Git
In this video we'll go over how to handle a merge conflict in Git, as well as a few strategies to avoid them.
00:00 What is a Merge Conflict?
01:06 Creating a Merge Conflict
03:42 Fixing a Merge Conflict
10:38 Using Scaffolding/Skeletons to Prevent Merge Conflicts
15:47 Scaffolding/Skeletons in HTML