Resolve merge conflicts

Learn why conflicts happen and how to resolve them.

Finish

Congratulations friend, you've completed this course!

celebrate

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?


Get help: Post in our discussion boardReview the GitHub status page

© 2023 GitHub • Code of ConductMIT License