Merge Conflicts Pro
This course was originally recorded in 2017. It has been reviewed and all content and materials updated as of May 2020.
In the Beginning Git video series, you discovered how powerful the branch-and-merge paradigm is. But merging isn't always as simple as it might first appear. In this video you will learn how to handle merge conflicts—which occur when Git cannot work out how to automatically combine changes.