This commit is contained in:
gilesb 2023-10-23 15:22:37 +01:00 committed by giles
parent 569b235726
commit 1dcebf80fa
1 changed files with 1 additions and 1 deletions

View File

@ -43,7 +43,7 @@ jobs:
- name: push
run: |
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
git rebase origin/master
git rebase origin/master --strategy ours
echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;