Skip to content

Commit 3afa6ad

Browse files
committed
modified refresh step to more context aware step since not present in issue based and also corrected outdated ui instrcutions
1 parent eddfe29 commit 3afa6ad

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

.github/steps/1-create-a-pr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ _Welcome to "Managing Merge Conflicts"! :wave:_
99
1. Open a new browser tab, and work on the steps in your second tab while you read the instructions in this tab.
1010
1. We made a small change to a file in the repository in the `my-resume` branch.
1111
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.
12-
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.
12+
1. Now that your pull request is opened, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.

.github/steps/2-resolve-a-merge-conflict.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ This can be intimidating, but have no fear, Git is smart when it comes to mergin
1818
```
1919
1. With the merge conflict markers removed, click **Mark as resolved**.
2020
1. Finally, click **Commit merge**.
21-
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.
21+
1. Now that the conflict is resolved, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.

.github/steps/3-create-your-own-conflict.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ Now, let's get a little evil. (It's for educational purposes!)
1010

1111
We went ahead and added a new file called `references.md` and pushed that change to `main`, without updating your `my-resume` branch.
1212

13-
1. Browse to the `my-resume` branch.
13+
1. Browse and switch to the `my-resume` branch.
1414
1. Click the `Add file` dropdown menu and then on `Create new file`.
1515
1. Create a file named `references.md`.
1616
1. Enter some text that conflicts with what we added for `references.md` in the `main` branch.
17-
1. Scroll to the bottom of the page and enter a commit message for your change.
18-
1. Click the **Commit new file** button, making sure the "Commit directly to the `my-resume` branch" option is selected.
19-
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.
17+
1. Click the **Commit changes** button at the top right of the editor. In the Commit message modal that appears:
18+
- Enter a commit message (e.g., Create references.md).
19+
- Make sure the "Commit directly to the `my-resume` branch" option is selected.
20+
- Click the green "Commit changes" button to finish.
21+
1. Now that you've created a new conflict, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.

.github/steps/4-merge-your-pull-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glo
1010
> Look back at step one if you need help.
1111
1. Click **Merge pull request**.
1212
1. Delete the branch `my-resume` (optional).
13-
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.
13+
1. Now that your pull request is merged, Mona should already be busy checking your work. Give her a moment and keep watch in the comments. You will see her respond with progress info and the next lesson.

.github/workflows/2-resolve-a-merge-conflict.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@v4
3333
with:
3434
fetch-depth: 0
35-
ref: main # ensure base branch context
35+
ref: main
3636

3737
- name: Get response templates
3838
uses: actions/checkout@v4

0 commit comments

Comments
 (0)