Skip to content

Commit 4125c3b

Browse files
authored
Refresh review page
1 parent c11f58c commit 4125c3b

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

.github/steps/x-review.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22

33
<img src=https://octodex.github.com/images/benevocats.jpg alt=celebrate width=300 align=right>
44

5-
Here's a recap of all the tasks you've accomplished in your repository:
5+
Congratulations! You've successfully completed the **Resolve Merge Conflicts** exercise. 🎉
66

7-
- You learned why merge conflicts happen.
8-
- You resolved a simple merge conflict.
9-
- You created a merge conflict, and resolved it!
7+
You've learned essential skills for collaborative development on GitHub:
8+
9+
- **Understanding merge conflicts**: You now know why conflicts occur when multiple people edit the same file
10+
- **Identifying conflicts**: You can recognize when GitHub detects merge conflicts in pull requests
11+
- **Resolving conflicts**: You've practiced using GitHub's web editor to manually resolve conflicts by choosing which changes to keep
12+
- **Merging successfully**: You completed the workflow by merging your pull request after resolving conflicts
1013

1114
### What's next?
1215

13-
- Make your own Markdown resume site with GitHub Pages! Learn how in our [GitHub Pages](https://github.com/skills/github-pages) exercise.
14-
- We'd love to hear what you thought of this exercise [in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts).
15-
- [Take another GitHub Skills exercise](https://github.com/skills).
16-
- [Read the GitHub Getting Started docs](https://docs.github.com/en/get-started).
17-
- To find projects to contribute to, check out [GitHub Explore](https://github.com/explore).
16+
Check out other [GitHub Skills exercises](https://learn.github.com/skills).
17+
18+
- [GitHub Pages](https://github.com/skills/github-pages) - Publish your own static website for free.
19+
- [Communicate using Markdown](https://github.com/skills/communicate-using-markdown) - Improve your documentation skills
20+
- [Getting Started with GitHub Copilot](https://github.com/skills/getting-started-with-github-copilot) - Learn, build, debug and ship faster with an AI pair programmer.

0 commit comments

Comments
 (0)