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

Initial commit

Browse Source
This commit is contained in:
Nayan Sawyer
2023-09-12 14:40:31 -04:00
committed by GitHub
commit fe7a44ad13
17 changed files with 671 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/steps/1-create-a-pr.md vendored Normal file
View File

@@ -0,0 +1,20 @@
<!--
<<< 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.