Learn why conflicts happen and how to resolve them.
Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary.
- Who is this for: New developers, new Git and GitHub users
- What you'll learn: We'll introduce the tools for inspecting and resolving a merge conflict.
- What you'll build: You'll use a web editor to fix conflicting changes to Markdown file.
- Prerequisites:
- Skills Exercise: Introduction to GitHub
- How long: less than 30 minutes
In this exercise, you will:
- Learn the causes of a merge conflict.
- The tools for resolving a merge conflict.
- When and how to resolve a merge conflict.
Simply copy the exercise to your account, then give your favorite Octocat (Mona) about 20 seconds to prepare the first lesson, then refresh the page.
Having trouble? 🤷
When copying the exercise, we recommend the following settings:
-
For owner, choose your personal account or an organization to host the repository.
-
We recommend creating a public repository, since private repositories will use Actions minutes.
If the exercise isn't ready in 20 seconds, please check the Actions tab.
-
Check to see if a job is running. Sometimes it simply takes a bit longer.
-
If the page shows a failed job, please submit an issue. Nice, you found a bug! 🐛
© 2025 GitHub • Code of Conduct • MIT License