Get immediate access to this and 4,000+ other videos and books.

Take your career further with a raywenderlich.com Pro subscription. With unlimited access to over 40+ books and 4,000+ professional videos in a single subscription, it’s simply the best investment you can make in your development career.

Learn more

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.

Sam Davies
By Sam Davies May 1 2020 · Episode (9 mins) · Intermediate
Software Engineering Tools & Libraries iOS & Swift Tutorials Android & Kotlin Tutorials Server-Side Swift Game Tech Tutorials macOS Tutorials

Reviews

Comments