https://github.com/thaiha-hub/github-skills-resolve-merge-conflicts
another skill for github
https://github.com/thaiha-hub/github-skills-resolve-merge-conflicts
github-skills
Last synced: 5 months ago
JSON representation
another skill for github
- Host: GitHub
- URL: https://github.com/thaiha-hub/github-skills-resolve-merge-conflicts
- Owner: thaiha-hub
- License: mit
- Created: 2025-06-18T19:58:07.000Z (about 1 year ago)
- Default Branch: main
- Last Pushed: 2025-06-18T19:58:31.000Z (about 1 year ago)
- Last Synced: 2025-06-18T20:42:24.191Z (about 1 year ago)
- Topics: github-skills
- Homepage:
- Size: 0 Bytes
- Stars: 0
- Watchers: 0
- 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)