mirror of
https://github.com/opus-tango/skills-resolve-merge-conflicts.git
synced 2026-03-20 03:55:26 +00:00
50 lines
1.6 KiB
Markdown
50 lines
1.6 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: Step 4 >>>
|
||
Start this step by acknowledging the previous step.
|
||
Define terms and link to docs.github.com.
|
||
-->
|
||
|
||
## Step 4: Merge your pull request
|
||
|
||
_Almost there! :heart:_
|
||
|
||
You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
|
||
|
||
### :keyboard: Activity: Merge your pull request
|
||
|
||
1. First, resolve any remaining conflicts in your pull request.
|
||
> Look back at step one if you need help.
|
||
1. Click **Merge pull request**.
|
||
1. Delete the branch `my-resume` (optional).
|
||
1. Wait about 20 seconds then refresh this page (the one you're following instructions from). [GitHub Actions](https://docs.github.com/en/actions) will automatically update to the next step.
|
||
|
||
<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>
|