opus-tango/skills-resolve-merge-conflicts

mirror of https://github.com/opus-tango/skills-resolve-merge-conflicts.git synced 2026-03-20 03:55:26 +00:00

Go to file

Nayan Sawyer 8331893ea5 Merge branch 'main' into my-resume

2023-09-12 14:49:53 -04:00

Update to 4 in STEP and README.md

2023-09-12 18:48:41 +00:00

.gitignore

Initial commit

2023-09-12 14:40:31 -04:00

LICENSE

Initial commit

2023-09-12 14:40:31 -04:00

README.md

Update to 4 in STEP and README.md

2023-09-12 18:48:41 +00:00

references.md

Merge branch 'main' into my-resume

2023-09-12 14:49:53 -04:00

resume.md

Update resume.md in my-resume

2023-09-12 18:40:54 +00:00

README.md

Resolve merge conflicts

Learn why conflicts happen and how to resolve them.

Step 4: Merge your pull request

Almost there! ❤️

You can now merge your pull request!

⌨️ Activity: Merge your pull request

First, resolve any remaining conflicts in your pull request.

Look back at step one if you need help.
Click Merge pull request.
Delete the branch my-resume (optional).
Wait about 20 seconds then refresh this page (the one you're following instructions from). GitHub Actions will automatically update to the next step.

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

© 2023 GitHub • Code of Conduct • MIT License