Resolve merge conflicts

Learn why conflicts happen and how to resolve them.

Finish

Congratulations friend, you've completed this course!

Here's a recap of all the tasks you've accomplished in your repository:

• You learned why merge conflicts happen.
• You resolved a simple merge conflict.
• You created a merge conflict, and resolved it!

What's next?

• Make your own Markdown resume site with GitHub Pages! Learn how in our GitHub Pages course.
• We'd love to hear what you thought of this course in our discussion board.
• Take another GitHub Skills course.
• Read the GitHub Getting Started docs.
• To find projects to contribute to, check out GitHub Explore.

---

Get help: Post in our discussion board • Review the GitHub status page

© 2023 GitHub • Code of Conduct • MIT License