From d6801c82958513a5e821babbf2d72909b0a97bb8 Mon Sep 17 00:00:00 2001
From: ChristophShyper <45788587+ChristophShyper@users.noreply.github.com>
Date: Mon, 18 May 2026 22:20:58 +0200
Subject: [PATCH] fix: streamline commit and push logic for release branch
 preparation

---
 .../reusable-manual-release-branch-prepare.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/reusable-manual-release-branch-prepare.yml b/.github/workflows/reusable-manual-release-branch-prepare.yml
index 4917344..f345bf9 100644
--- a/.github/workflows/reusable-manual-release-branch-prepare.yml
+++ b/.github/workflows/reusable-manual-release-branch-prepare.yml
@@ -203,23 +203,17 @@ jobs:
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Commit and push release branch (with file changes)
-        if: ${{ !inputs.build-and-push-only && steps.changes.outputs.has_changes == 'true' }}
-        uses: devops-infra/action-commit-push@v1
-        with:
-          github_token: ${{ github.token }}
-          commit_message: "chore(release): prepare ${{ steps.version.outputs.REL_VERSION }}"
-          target_branch: release/${{ steps.version.outputs.REL_VERSION }}
-
-      - name: Commit and push release branch (no file changes)
-        if: ${{ !inputs.build-and-push-only && steps.changes.outputs.has_changes == 'false' }}
+      - name: Commit and push release branch
+        if: ${{ !inputs.build-and-push-only }}
         uses: devops-infra/action-commit-push@v1
         with:
           github_token: ${{ github.token }}
           commit_message: "chore(release): prepare ${{ steps.version.outputs.REL_VERSION }}"
-          no_edit: true
+          base_branch: ${{ github.event.repository.default_branch }}
+          reset_target_branch: true
+          allow_empty_commit: true
+          force_with_lease: true
           target_branch: release/${{ steps.version.outputs.REL_VERSION }}
-          amend: true
 
       - name: Create release pull request
         if: ${{ !inputs.build-and-push-only }}