generated from archlinux/template
Use merge instead of rebase
This commit is contained in:
parent
bc8dfc2e88
commit
cec6417f14
@ -22,11 +22,11 @@ jobs:
|
|||||||
- name: Fetch AUR
|
- name: Fetch AUR
|
||||||
run: git fetch aur
|
run: git fetch aur
|
||||||
|
|
||||||
- name: Rebase current changes
|
- name: Merge latest changes
|
||||||
run: git rebase aur/master
|
run: git merge aur/master
|
||||||
|
|
||||||
- name: Push changes (if any)
|
- name: Push changes (if any)
|
||||||
run: git push -f origin master
|
run: git push origin master
|
||||||
|
|
||||||
wake:
|
wake:
|
||||||
name: Wake Runner
|
name: Wake Runner
|
||||||
|
Loading…
x
Reference in New Issue
Block a user