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

Update to 4 in STEP and README.md

Browse Source
This commit is contained in:
github-actions
2023-09-12 18:48:41 +00:00
parent fc549fe066
commit d82386b173
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
README.md
View File

@@ -14,29 +14,23 @@ _Learn why conflicts happen and how to resolve them._
</header>
<!--
<<< Author notes: Step 3 >>>
<<< Author notes: Step 4 >>>
Start this step by acknowledging the previous step.
Define terms and link to docs.github.com.
-->
## Step 3: Create your own conflict
## Step 4: Merge your pull request
_Good job! You've solved a merge conflict! :tada:_
_Almost there! :heart:_
Resolving a conflict doesn't automatically merge the pull request in GitHub. Instead, it stores the resolution of the conflict in a merge commit and allows you and your team to keep working. To resolve a conflict, GitHub performs what is known as a _reverse merge_. This means that the changes from the `main` branch were merged into your `my-resume` branch. With a reverse merge, only the `my-resume` branch is updated. This allows you to test the resolved changes on your branch before you merge it into `main`.
You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
Now, let's get a little evil. (It's for educational purposes!)
### :keyboard: Activity: Merge your pull request
### :keyboard: Activity: Create your own conflict
We went ahead and added a new file called `references.md` and pushed that change to `main`, without updating your `my-resume` branch.
1. Browse to the `my-resume` branch.
1. Click the `Add file` dropdown menu and then on `Create new file`.
1. Create a file named `references.md`.
1. Enter some text that conflicts with what we added for `references.md` in the `main` branch.
1. Scroll to the bottom of the page and enter a commit message for your change.
1. Click the **Commit new file** button, making sure the "Commit directly to the `my-resume` branch" option is selected.
1. First, resolve any remaining conflicts in your pull request.
> Look back at step one if you need help.
1. Click **Merge pull request**.
1. Delete the branch `my-resume` (optional).
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>