codex-admin/skills-resolve-merge-conflicts

mirror of https://github.com/elisspace/skills-resolve-merge-conflicts.git synced 2026-08-29 15:44:08 +00:00

Go to file

dependabot[bot] 665f2d5f27 Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

2023-10-01 19:42:58 +00:00

.github

Bump actions/checkout from 3 to 4

2023-10-01 19:42:58 +00:00

.gitignore

Initial commit

2023-06-07 00:19:45 +07:00

LICENSE

Initial commit

2023-06-07 00:19:45 +07:00

README.md

Update to X in STEP and README.md

2023-06-06 17:32:19 +00:00

references.md

Merge branch 'main' into my-resume

2023-06-06 13:30:52 -04:00

resume.md

Merge branch 'main' into my-resume

2023-06-06 13:26:35 -04:00

README.md

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