Skip to content

Commit 25a9d63

Browse files
committed
updated exercise to stop use of -step.txt and use resume.md instead to simulate merge conflict
1 parent 0c9ff21 commit 25a9d63

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ jobs:
3636
with:
3737
fetch-depth: 0
3838

39-
- name: Simulate conflict between main and my-resume
39+
- name: Simulate conflict in resume.md
4040
run: |
4141
git checkout -b my-resume
4242
git config user.name github-actions[bot]
4343
git config user.email github-actions[bot]@users.noreply.github.com
44-
sed -i 's/1/2/' .github/steps/-step.txt
45-
git add .github/steps/-step.txt
46-
git commit -m "Update step in my-resume"
44+
echo "- Contributed to open source projects" >> resume.md
45+
git add resume.md
46+
git commit -m "Add open source contribution"
4747
git push origin my-resume
4848
4949
git checkout main
50-
sed -i 's/Experience/Jobs/' resume.md
50+
echo "- Built internal tools at Acme Corp" >> resume.md
5151
git add resume.md
52-
git commit -m "Update resume.md in main"
52+
git commit -m "Add Acme Corp experience"
5353
git push origin main
5454
env:
5555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)