mirror of
https://github.com/opus-tango/skills-resolve-merge-conflicts.git
synced 2026-03-20 03:55:26 +00:00
55 lines
1.9 KiB
Markdown
55 lines
1.9 KiB
Markdown
<header>
|
||
|
||
<!--
|
||
<<< Author notes: Course header >>>
|
||
Include a 1280×640 image, course title in sentence case, and a concise description in emphasis.
|
||
In your repository settings: enable template repository, add your 1280×640 social image, auto delete head branches.
|
||
Add your open source license, GitHub uses MIT license.
|
||
-->
|
||
|
||
# Resolve merge conflicts
|
||
|
||
_Learn why conflicts happen and how to resolve them._
|
||
|
||
</header>
|
||
|
||
<!--
|
||
<<< Author notes: Finish >>>
|
||
Review what we learned, ask for feedback, provide next steps.
|
||
-->
|
||
|
||
## Finish
|
||
|
||
_Congratulations friend, you've completed this course!_
|
||
|
||
<img src=https://octodex.github.com/images/benevocats.jpg alt=celebrate width=300 align=right>
|
||
|
||
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).
|
||
|
||
<footer>
|
||
|
||
<!--
|
||
<<< Author notes: Footer >>>
|
||
Add a link to get support, GitHub status page, code of conduct, license link.
|
||
-->
|
||
|
||
---
|
||
|
||
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)
|
||
|
||
</footer>
|