Skip to content

Commit 282a597

Browse files
committed
updated exercise to reference correct md files for steps
1 parent 26c725b commit 282a597

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

.github/workflows/0-start-exercise.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
issues: write
1212

1313
env:
14-
STEP_1_FILE: ".github/steps/1-open-a-pull-request.md"
14+
STEP_1_FILE: ".github/steps/1-create-a-pr.md"
1515

1616
jobs:
1717
start_exercise:

.github/workflows/1-create-a-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
issues: write
1313

1414
env:
15-
STEP_2_FILE: ".github/steps/2-assign-yourself.md"
15+
STEP_2_FILE: ".github/steps/2-resolve-a-merge-conflict.md"
1616

1717
jobs:
1818
find_exercise:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
issues: write
1313

1414
env:
15-
STEP_3_FILE: ".github/steps/3-leave-a-review.md"
15+
STEP_3_FILE: ".github/steps/3-create-your-own-conflict.md"
1616

1717
jobs:
1818
find_exercise:

.github/workflows/3-create-your-own-conflict.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
issues: write
1212

1313
env:
14-
STEP_4_FILE: ".github/steps/4-suggest-changes.md"
14+
STEP_4_FILE: ".github/steps/4-merge-your-pull-request.md"
1515

1616
jobs:
1717
find_exercise:

.github/workflows/4-merge-your-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
issues: write
1212

1313
env:
14-
STEP_5_FILE: ".github/steps/5-merge-your-pull-request.md"
14+
STEP_5_FILE: ".github/steps/X-finish.md"
1515

1616
jobs:
1717
find_exercise:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ In this exercise, you will:
4040

4141
Simply copy the exercise to your account, then give your favorite Octocat (Mona) **about 20 seconds** to prepare the first lesson, then **refresh the page**.
4242

43-
[![](https://img.shields.io/badge/Copy%20This%20Repo-%E2%86%92-1f883d?style=for-the-badge&logo=github&labelColor=197935)](https://github.com/new?template_owner=Chukslord1&template_name=resolve-merge-conflicts)
43+
[![](https://img.shields.io/badge/Copy%20This%20Repo-%E2%86%92-1f883d?style=for-the-badge&logo=github&labelColor=197935)](https://github.com/new?template_owner=Chukslord1&template_name=resolve-merge-conflicts&owner=%40me&name=skills-resolve-merge-conflicts&description=My+clone+repository&visibility=public)
4444

4545
<details>
4646
<summary>Having trouble? 🤷</summary><br/>

index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head><title>Resolve Merge Conflicts</title></head>
4+
<body><h1>Hello GitHub!</h1></body>
5+
</html>

0 commit comments

Comments
 (0)