From db1d6f68032a0042f335c0f4779d9182e81af0c4 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 15 Jun 2025 12:55:54 +0200
Subject: [PATCH] Update onpush_superlinter.yml

---
 .github/workflows/onpush_superlinter.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/onpush_superlinter.yml b/.github/workflows/onpush_superlinter.yml
index d15315d9e..71cc13aa9 100644
--- a/.github/workflows/onpush_superlinter.yml
+++ b/.github/workflows/onpush_superlinter.yml
@@ -58,10 +58,19 @@ jobs:
           FIX_PYTHON_ISORT: true
           FIX_PYTHON_RUFF: true
 
+      - name: Remove Super-Linter output (prevent checkout conflict)
+        run: sudo rm -rf super-linter-output/
+
+      - name: Pull latest changes to avoid non-fast-forward push errors
+        run: |
+          git config --global user.name "github-actions"
+          git config --global user.email "github-actions@github.com"
+          git fetch origin master
+          git pull --rebase origin master
+
       - name: Commit and push linting fixes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "chore: fix linting issues"
-          commit_user_name: super-linter
-          commit_user_email: super-linter@super-linter.dev
-          push_options: '--force'
+          commit_user_name: "github-actions"
+          commit_user_email: "github-actions@github.com"