Update .forgejo/workflows/pull-upstream.yaml
This commit is contained in:
parent
ce0fc71238
commit
0a42bed955
|
@ -17,7 +17,7 @@ jobs:
|
||||||
- name: Pull upstream
|
- name: Pull upstream
|
||||||
run: |
|
run: |
|
||||||
git remote add upstream https://github.com/void-linux/void-packages
|
git remote add upstream https://github.com/void-linux/void-packages
|
||||||
git pull --rebase upstream master
|
git pull --rebase=merges upstream master
|
||||||
|
|
||||||
- name: Commit
|
- name: Commit
|
||||||
if: ${{ steps.changed.outputs.all_changed_files != '' }}
|
if: ${{ steps.changed.outputs.all_changed_files != '' }}
|
||||||
|
|
Loading…
Reference in New Issue