Skip to content

Commit 7759fc6

Browse files
committed
updated exercise to stop use of -step.txt and use resume.md instead to simulate merge conflict fixed the issue with branch version
1 parent 25a9d63 commit 7759fc6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ jobs:
4747
git push origin my-resume
4848
4949
git checkout main
50+
git pull --rebase origin main
5051
echo "- Built internal tools at Acme Corp" >> resume.md
5152
git add resume.md
5253
git commit -m "Add Acme Corp experience"
5354
git push origin main
5455
env:
5556
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56-
57+
5758
post_next_step_content:
5859
name: Post next step content
5960
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)