File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -36,20 +36,20 @@ jobs:
36
36
with :
37
37
fetch-depth : 0
38
38
39
- - name : Simulate conflict between main and my- resume
39
+ - name : Simulate conflict in resume.md
40
40
run : |
41
41
git checkout -b my-resume
42
42
git config user.name github-actions[bot]
43
43
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 "
47
47
git push origin my-resume
48
48
49
49
git checkout main
50
- sed -i 's/Experience/Jobs/' resume.md
50
+ echo "- Built internal tools at Acme Corp" >> resume.md
51
51
git add resume.md
52
- git commit -m "Update resume.md in main "
52
+ git commit -m "Add Acme Corp experience "
53
53
git push origin main
54
54
env :
55
55
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
You can’t perform that action at this time.
0 commit comments