diff --git a/.gitea/workflows/nix-update.yml b/.gitea/workflows/nix-update.yml index 467d5a8..1cd7e9a 100644 --- a/.gitea/workflows/nix-update.yml +++ b/.gitea/workflows/nix-update.yml @@ -159,6 +159,12 @@ jobs: run: | cd "$REPO_DIR" PACKAGES="${{ steps.update.outputs.updated_packages }}" + + echo "Checking for dirty state..." + git status --porcelain + + echo "Resetting any unstaged changes (e.g. dirty lockfiles) before rebase..." + git reset --hard HEAD echo "Pulling latest changes (rebase)..." git pull --rebase origin master