mirror of
https://github.com/opus-tango/skills-resolve-merge-conflicts.git
synced 2026-03-20 03:55:26 +00:00
20 lines
741 B
Markdown
20 lines
741 B
Markdown
<!--
|
|
<<< 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.
|