From 715fe52a8a6183ad633c68e0849c23b6b5433eff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Sep 2024 18:32:22 +0000 Subject: [PATCH] Update to 4 in STEP and README.md --- .github/steps/-step.txt | 2 +- README.md | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt index 00750ed..b8626c4 100644 --- a/.github/steps/-step.txt +++ b/.github/steps/-step.txt @@ -1 +1 @@ -3 +4 diff --git a/README.md b/README.md index 91f9f10..3331d51 100644 --- a/README.md +++ b/README.md @@ -14,29 +14,23 @@ _Learn why conflicts happen and how to resolve them._ -## 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.