From 3b096994f31d593b04dc19323c0aa36b17ade755 Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 17:37:17 +0100 Subject: [PATCH] ssss --- .gitea/workflows/build->develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 859a903..48a6258 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -43,6 +43,7 @@ jobs: - name: push run: | if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then + echo rebasing with master git rebase origin/master --strategy-option ours git log -5 echo no development branch so pushing