File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -32,16 +32,33 @@ jobs:
3232 run : |
3333 git checkout -b pull_upstream
3434
35- - name : Pull from upstream
35+ - name : Add remote for upstream
3636 shell : bash
3737 run : |
3838 git remote add upstream https://github.com/kostrykin/python-learning-codespace
3939 git fetch upstream
40+
41+ - name : Merge (squash)
42+ continue-on-error : true
43+ shell : bash
44+ run : |
4045 git merge upstream/master --allow-unrelated-histories --squash
41- git commit --allow-empty -a -m "Update configuration"
46+
47+ - name : Commit
48+ id : commit
49+ continue-on-error : true
50+ shell : bash
51+ run : |
52+ git commit -a -m "Update configuration"
53+
54+ - name : Push
55+ if : steps.commit.outcome == 'success'
56+ shell : bash
57+ run : |
4258 git push origin pull_upstream
4359
4460 - name : Create pull request
61+ if : steps.commit.outcome == 'success'
4562 shell : bash
4663 run : |
4764 gh pr create --fill --head pull_upstream
You can’t perform that action at this time.
0 commit comments