Video Placeholder

Ready to subscribe?

Subscribe to unlock this plus all our other great video content

Monthly plan

$19.99 /month

Yearly plan

$14.99 /month $179.88 billed once a year Save 25%
Implementation of Git
Stashes

Mastering Git

2. Merge Conflicts

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.

Course Lessons

Lesson Discussion

Mastering Git - Part 2: Merge Conflicts