workflow: rebase instead of reset to fix git push

2025-03-22 07:30:22 +01:00 · 2025-03-22 07:30:22 +01:00 · 4cce287379
commit 4cce287379
parent 239eaa7dd6
1 changed files with 2 additions and 1 deletions
--- 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