Merge branch 'main' into teutat3s
This commit is contained in:
commit
6c0585edc7
|
@ -22,6 +22,7 @@ steps:
|
|||
- git checkout -b devos --track origin/devos
|
||||
- git merge -X theirs devos/main
|
||||
- git push origin devos
|
||||
- git remote set-url origin https://git.b12f.io/pub-solar/os.git
|
||||
|
||||
- name: "Sync $BRANCH with upstream"
|
||||
image: alpine/git
|
||||
|
|
Loading…
Reference in a new issue