From d2a5bb2f928110d68d9c36bc4c9ab8017c075d17 Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 18:38:16 +0100 Subject: [PATCH] rebase29 --- .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 b3f8454..b100bf3 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -44,6 +44,7 @@ jobs: run: | if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then ls + git log -5 git rebase origin/master --strategy-option=ours ls git log -5