From b0cfd0ef5d2c4b7556196361b39b926b334b6f39 Mon Sep 17 00:00:00 2001
From: Marco Maatz <mma@greyhound-software.com>
Date: Thu, 24 Oct 2024 15:07:04 +0200
Subject: [PATCH] pull ff only

---
 .gitea/workflows/setPackageVersion.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/setPackageVersion.yaml b/.gitea/workflows/setPackageVersion.yaml
index 9395671..8e53143 100644
--- a/.gitea/workflows/setPackageVersion.yaml
+++ b/.gitea/workflows/setPackageVersion.yaml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Set
         run: |
-          git pull origin HEAD:${{ inputs.branch }}
+          git pull --ff-only origin ${{ inputs.branch }}
 
           echo "Setting Version to ${{ inputs.version }}"
 
@@ -53,4 +53,4 @@ jobs:
       
       - name: Push changes back to repository
         run: |
-          git push origin HEAD:${{ inputs.branch }}
\ No newline at end of file
+          git push origin ${{ inputs.branch }}
\ No newline at end of file