From 77ad158da009976c9a0601965fab11150c22378a8d6589b9aa3ff7190803c411 Mon Sep 17 00:00:00 2001
From: "Marc S. Weidner" <msw@coresecret.dev>
Date: Mon, 2 Jun 2025 09:53:50 +0200
Subject: [PATCH] V8.03.144.2025.06.02

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
---
 .gitea/workflows/render-md-to-html.yaml | 31 +++++++++++++++++--------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/render-md-to-html.yaml b/.gitea/workflows/render-md-to-html.yaml
index af1e8ab..7bc174a 100644
--- a/.gitea/workflows/render-md-to-html.yaml
+++ b/.gitea/workflows/render-md-to-html.yaml
@@ -141,16 +141,27 @@ jobs:
               -o "${out}"
           done
 
-      #- name: Sync with remote before commit to avoid Job Race Conditions.
-      #  shell: bash
-      #  env:
-      #    GIT_SSH_COMMAND: "ssh -p 42842"
-      #  run: |
-      #    export GNUPGHOME="$(pwd)/.gnupg"
-      #    git fetch origin master
-      #    git rebase origin/master
-      #    git status
-      #    git log --oneline -n 5
+      - name: Sync with remote before commit to avoid Job Race Conditions.
+        shell: bash
+        env:
+          GIT_SSH_COMMAND: "ssh -p 42842"
+        run: |
+          set -euo pipefail
+          export GNUPGHOME="$(pwd)/.gnupg"
+
+          echo "🔒 Stashing local changes (if any) ..."
+          git stash push --include-untracked --message "pre-rebase stash" || true
+
+          echo "🔄 Fetching and rebasing from origin/master ..."
+          git fetch origin master
+          git rebase origin/master
+
+          echo "🎯 Restoring local changes from stash (if any) ..."
+          git stash pop || echo "ℹ️ Nothing to pop or merge conflict during stash pop."
+
+          echo "📋 Current status after rebase : "
+          git status
+          git log --oneline -n 5
 
       - name: Stage generated files.
         shell: bash