https://github.com/jrgil20/skills-resolve-merge-conflicts

skill: conflicts
https://github.com/jrgil20/skills-resolve-merge-conflicts

conflict-resolution skills-course

Last synced: 14 days ago
JSON representation

skill: conflicts

• Host: GitHub
• URL: https://github.com/jrgil20/skills-resolve-merge-conflicts
• Owner: Jrgil20
• License: mit
• Created: 2024-08-12T11:18:16.000Z (3 months ago)
• Default Branch: main
• Last Pushed: 2024-08-12T11:32:09.000Z (3 months ago)
• Last Synced: 2024-10-05T06:41:30.853Z (about 1 month ago)
• Topics: conflict-resolution, skills-course
• Homepage:
• Size: 20.5 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        


# 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](https://github.com/skills/github-pages) course.

- We'd love to hear what you thought of this course [in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts).

- [Take another GitHub Skills course](https://github.com/skills).

- [Read the GitHub Getting Started docs](https://docs.github.com/en/get-started).

- To find projects to contribute to, check out [GitHub Explore](https://github.com/explore).

---

Get help: [Post in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts) • [Review the GitHub status page](https://www.githubstatus.com/)

© 2023 GitHub • [Code of Conduct](https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md) • [MIT License](https://gh.io/mit)