mirror of
https://github.com/opus-tango/skills-resolve-merge-conflicts.git
synced 2026-03-20 03:55:26 +00:00
51 lines
2.2 KiB
Markdown
51 lines
2.2 KiB
Markdown
<header>
|
||
|
||
<!--
|
||
<<< Author notes: Course header >>>
|
||
Include a 1280×640 image, course title in sentence case, and a concise description in emphasis.
|
||
In your repository settings: enable template repository, add your 1280×640 social image, auto delete head branches.
|
||
Add your open source license, GitHub uses MIT license.
|
||
-->
|
||
|
||
# Resolve merge conflicts
|
||
|
||
_Learn why conflicts happen and how to resolve them._
|
||
|
||
</header>
|
||
|
||
<!--
|
||
<<< Author notes: Step 1 >>>
|
||
Choose 3-5 steps for your course.
|
||
The first step is always the hardest, so pick something easy!
|
||
Link to docs.github.com for further explanations.
|
||
Encourage users to open new tabs for steps!
|
||
-->
|
||
|
||
## 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.
|
||
|
||
<footer>
|
||
|
||
<!--
|
||
<<< Author notes: Footer >>>
|
||
Add a link to get support, GitHub status page, code of conduct, license link.
|
||
-->
|
||
|
||
---
|
||
|
||
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)
|
||
|
||
</footer>
|