generated from archlinux/template
Allow merging unrelated histories
This commit is contained in:
parent
a383314040
commit
4c3f415759
@ -1,3 +1,4 @@
|
|||||||
|
name: Workflows
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
@ -23,7 +24,7 @@ jobs:
|
|||||||
run: git fetch aur
|
run: git fetch aur
|
||||||
|
|
||||||
- name: Merge latest changes
|
- name: Merge latest changes
|
||||||
run: git merge aur/master
|
run: git merge aur/master --allow-unrelated-histories
|
||||||
|
|
||||||
- name: Push changes (if any)
|
- name: Push changes (if any)
|
||||||
run: git push origin master
|
run: git push origin master
|
||||||
|
Loading…
x
Reference in New Issue
Block a user