opus-tango/skills-resolve-merge-conflicts
1
0
Fork 0
mirror of https://github.com/opus-tango/skills-resolve-merge-conflicts.git synced 2026-03-20 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
9e0a17d47062ebbac5d5994e8067108e87b93340
skills-resolve-merge-conflicts/README.md
github-actions 9e0a17d470 Update to 4 in STEP and README.md
2023-09-12 18:48:41 +00:00

1.6 KiB
Raw Blame History

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

  1. First, resolve any remaining conflicts in your pull request.

    Look back at step one if you need help.

  2. Click Merge pull request.
  3. Delete the branch my-resume (optional).
  4. 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

Reference in New Issue View Git Blame Copy Permalink