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