From 9cb94669923278dcc768bc9422180f69b140a93f Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 22 Mar 2025 07:30:22 +0100
Subject: [PATCH] workflow: rebase instead of reset to fix git push

---
 .gitea/workflows/update-flake.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml
index f2a9129..682557e 100644
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@@ -19,7 +19,8 @@ jobs:
       - name: Fetch latest changes and reset branch
         run: |
           git fetch origin main
-          git reset --hard origin/main
+          git status
+          git rebase origin/main
 
       - name: Set up Nix
         uses: cachix/install-nix-action@v31