https://github.com/LadyKerr/skills-resolve-merge-conflicts
My clone repository
https://github.com/LadyKerr/skills-resolve-merge-conflicts
Last synced: 3 months ago
JSON representation
My clone repository
- Host: GitHub
- URL: https://github.com/LadyKerr/skills-resolve-merge-conflicts
- Owner: LadyKerr
- License: mit
- Created: 2024-03-27T22:27:09.000Z (about 1 year ago)
- Default Branch: main
- Last Pushed: 2024-03-27T22:27:36.000Z (about 1 year ago)
- Last Synced: 2024-11-19T19:15:13.754Z (5 months ago)
- Size: 7.81 KB
- Stars: 1
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
- jimsghstars - LadyKerr/skills-resolve-merge-conflicts - My clone repository (Others)
README
# Resolve merge conflicts
_Learn why conflicts happen and how to resolve them._
## Step 1: Create a pull request
_Welcome to "Managing Merge Conflicts"! :wave:_
**What is a _merge conflict_?**: A **merge conflict** occurs when changes are made to the same part of the same file on two different branches. You usually find out about conflicts in a pull request so let's start by creating one.
### :keyboard: Activity: Create a pull request
1. Open a new browser tab, and work on the steps in your second tab while you read the instructions in this tab.
1. We made a small change to a file in the repository in the `my-resume` branch.
1. [Create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) setting `my-resume` as the head branch and `main` as the base branch. You can enter `Resolving merge conflicts` for the pull request title and body.
1. Wait about 20 seconds then refresh this page (the one you're following instructions from). [GitHub Actions](https://docs.github.com/en/actions) will automatically update to the next step.---
Get help: [Post in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts) • [Review the GitHub status page](https://www.githubstatus.com/)
© 2023 GitHub • [Code of Conduct](https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md) • [MIT License](https://gh.io/mit)