Merge remote-tracking branch 'origin/main' into b12f

This commit is contained in:
Benjamin Bädorf 2021-10-25 00:07:45 +00:00
commit 0015849858

View file

@ -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