y

skills-resolve-merge-conflicts

public

0 stars

0 forks

0 issues

Commits

List of commits on branch main.

Unverified

d049117b0e9d83254d114c262924694bc5055f81

Update to 3 in STEP and README.md

ggithub-actions[bot] committed 4 months ago

Unverified

bd85b4037e0c19dfdae7a36ca2bcb7aaec444186

Update to 3 in STEP and README.md

ggithub-actions[bot] committed 4 months ago

Unverified

aad085594a59136dc28ce2497488b6a56e819be4

Add references.md

ggithub-actions[bot] committed 4 months ago

Verified

d6cfb9ad21b64ce1eab9e2813ac47c36910bba17

Merge branch 'main' into my-resume

yyalsaffar committed 4 months ago

Unverified

e680cd5d33cf5f693219f75bc63f3487240c67cb

Update to 2 in STEP and README.md

ggithub-actions[bot] committed 4 months ago

Unverified

fbdca02fc7a9db8062bcaa4606ef31790eee6a03

Update to 2 in STEP and README.md

ggithub-actions[bot] 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