From 67bf6a08ad1e835463dd927232fb1e591b101c8d Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 18:45:00 +0100 Subject: [PATCH] rebase31 --- .gitea/workflows/build->develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 9e4a794..1f13683 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -44,11 +44,11 @@ jobs: run: | if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then ls - git log -5 + git log -20 git status git rebase origin/master --strategy-option=ours ls - git log -5 + git log -20 git status echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};