From a3aeef2f0db4737ddfc8047acdd9453a8948f5a2 Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 18:29:44 +0100 Subject: [PATCH] rebase26 --- .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 0c3e8c5..d790e61 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 + ls git rebase -Xtheirs origin/master ls git log -5