From c0327e24fb6b6851e4e7c038dc3b68601d8f2a51 Mon Sep 17 00:00:00 2001 From: MrkMrk00 Date: Fri, 27 Feb 2026 09:09:31 +0100 Subject: [PATCH] fix(sync_branches): always sync with merge commit --- .github/workflows/sync_branches_push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_branches_push.yaml b/.github/workflows/sync_branches_push.yaml index 9a2de93..ad0ae97 100644 --- a/.github/workflows/sync_branches_push.yaml +++ b/.github/workflows/sync_branches_push.yaml @@ -64,7 +64,7 @@ jobs: git config pull.rebase false git switch ${{ inputs.baseBranch }} - git pull origin ${HEAD_BRANCH} --no-edit + git pull origin ${HEAD_BRANCH} --no-edit --no-ff git push https://github-actions:${{ secrets.githubToken }}@github.com/${{ github.repository }}.git ${{ inputs.baseBranch }}:${{ inputs.baseBranch }} - name: report failure to slack