Skip to content

Commit c495a89

Browse files
Update to X in STEP and README.md
1 parent 54ea76b commit c495a89

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

.github/steps/-step.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
X

README.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,29 @@ _Learn why conflicts happen and how to resolve them._
1414
</header>
1515

1616
<!--
17-
<<< Author notes: Step 4 >>>
18-
Start this step by acknowledging the previous step.
19-
Define terms and link to docs.github.com.
17+
<<< Author notes: Finish >>>
18+
Review what we learned, ask for feedback, provide next steps.
2019
-->
2120

22-
## Step 4: Merge your pull request
21+
## Finish
2322

24-
_Almost there! :heart:_
23+
_Congratulations friend, you've completed this course!_
2524

26-
You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
25+
<img src=https://octodex.github.com/images/benevocats.jpg alt=celebrate width=300 align=right>
2726

28-
### :keyboard: Activity: Merge your pull request
27+
Here's a recap of all the tasks you've accomplished in your repository:
2928

30-
1. First, resolve any remaining conflicts in your pull request.
31-
> Look back at step one if you need help.
32-
1. Click **Merge pull request**.
33-
1. Delete the branch `my-resume` (optional).
34-
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.
29+
- You learned why merge conflicts happen.
30+
- You resolved a simple merge conflict.
31+
- You created a merge conflict, and resolved it!
32+
33+
### What's next?
34+
35+
- Make your own Markdown resume site with GitHub Pages! Learn how in our [GitHub Pages](https://github.com/skills/github-pages) course.
36+
- 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).
37+
- [Take another GitHub Skills course](https://github.com/skills).
38+
- [Read the GitHub Getting Started docs](https://docs.github.com/en/get-started).
39+
- To find projects to contribute to, check out [GitHub Explore](https://github.com/explore).
3540

3641
<footer>
3742

0 commit comments

Comments
 (0)