Skip to content

Commit 4dd0600

Browse files
committed
updated exercise to remove merge coflcit simulation from step1 just in step0
1 parent 7759fc6 commit 4dd0600

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

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

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,8 @@ jobs:
2727
ISSUE_URL: ${{ needs.find_exercise.outputs.issue-url }}
2828

2929
steps:
30-
- name: Checkout repository
30+
- name: Checkout
3131
uses: actions/checkout@v4
32-
with:
33-
fetch-depth: 0
34-
35-
- name: Prepare a merge conflict
36-
run: |
37-
echo "Create my-resume branch"
38-
git checkout -b my-resume
39-
git config user.name github-actions[bot]
40-
git config user.email github-actions[bot]@users.noreply.github.com
41-
git add .github/steps/-step.txt
42-
git commit -m "Update step in my-resume"
43-
git push origin my-resume
44-
45-
echo "Create conflicting commit on main"
46-
git checkout main
47-
sed -i 's/Experience/Jobs/' resume.md
48-
git add resume.md
49-
git commit -m "Update resume.md in main"
50-
git push origin main
51-
env:
52-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5332

5433
- name: Get response templates
5534
uses: actions/checkout@v4
@@ -68,7 +47,7 @@ jobs:
6847
- name: Create comment - watching for progress
6948
run: |
7049
gh issue comment "$ISSUE_URL" \
71-
--body-file exercise-toolkit/markdown-templates/step-feedback/watching-for-progress.md
50+
--body-file "exercise-toolkit/markdown-templates/step-feedback/watching-for-progress.md"
7251
env:
7352
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7453

0 commit comments

Comments
 (0)