Managing Merge Conflicts

You might have heard the term merge conflict in hushed whispers from another Git user. Maybe you’ve encountered one yourself and had to Google your way out. You might also just be exploring everything Git has to offer and have no idea what a merge conflict is.

This course is designed for all of you. We demystify the merge conflict and, through a series of examples, prepare you to face off against the evil merge conflict and be the hero of the day!

In this course, we’ve created a few conflicts for you to resolve in a sample repository. This repository contains a GitHub Pages powered resume. That means, when you finish this course, you’ll have more than a few merge conflicts under your belt. You’ll also have a shiny new resume.

Don’t worry. When you’re all done, we’ll provide instructions for polishing your resume and getting it ready to share with others.

It’s a good idea to complete a few other courses first, specifically the Introduction to GitHub, and either GitHub Pages from GitHub Desktop or GitHub Pages from the Command Line.

If you have any questions while taking the course, make sure to create an Issue in the primary class repository.

Stuck? Open an issue in the repository for this class and mention @githubteacher for help from one of the GitHub trainers!