Managing merge conflicts

Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with other developers. While resolving differences might involve some discussion, merge conflicts don’t have to be scary.

This course guides you through the steps to finding the best merge conflict solution, so your team can keep building.

What you'll learn

We'll answer common questions like:

• What is a merge conflict and what causes them?
• How do you resolve merge conflicts?
• How do you reduce merge conflicts?

And when you're done you'll be able to:

• Understand how merging happens and what causes merge conflicts
• Resolve simple and complex merge conflicts with ease
• Share best practices to reduce merge conflicts with your team

What you'll build

• Completed source repository
• Completed resume deployed to GitHub Pages.

Prerequisites

We recommend taking Introduction to GitHub prior to this course.

Projects used

This makes use of the following open source projects. Consider exploring these repos and maybe even making contributions!

• resume-template: A simple Jekyll + GitHub Pages powered resume template
• Jekyll: a simple, blog-aware, static site generator.

Audience

New developers, new GitHub users, users new to Git, students, managers, teams