y

skills-resolve-merge-conflicts

public

0 stars

0 forks

0 issues

Commits

List of commits on branch main.

Unverified

c443a8a51927c2db0e9d92be4ae332e512814ba4

Update to X in STEP and README.md

ggithub-actions[bot] committed 4 months ago

Verified

26c30376b804fb373f725eee2f63f22f002ed53a

Merge pull request #1 from yalsaffar/my-resume

yyalsaffar committed 4 months ago

Verified

00fc035aae6da2fcc5899389e737c66a2db98319

Merge branch 'main' into my-resume

yyalsaffar committed 4 months ago

Unverified

2687d8de4a47bf18d99f223cf851f66777371204

Update to 4 in STEP and README.md

ggithub-actions[bot] committed 4 months ago

Unverified

68d49b292b0f243f91dc4273b90b56bec46e9e39

Update to 4 in STEP and README.md

ggithub-actions[bot] committed 4 months ago

Verified

4df2f22fda347c125ffd416a498032477e2be9d5

Create references.md

yyalsaffar committed 4 months ago

README

The README file for this repository.

Resolve merge conflicts

Learn why conflicts happen and how to resolve them.

Finish

Congratulations friend, you've completed this course!

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 course.
We'd love to hear what you thought of this course in our discussion board.
Take another GitHub Skills course.
Read the GitHub Getting Started docs.
To find projects to contribute to, check out GitHub Explore.

Get help: Post in our discussion board • Review the GitHub status page

© 2023 GitHub • Code of Conduct • MIT License