From 6587555e7aa5d665fd6756573e4d1eab163807f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n?= <sebastian@sebastian.software>
Date: Tue, 3 Feb 2026 08:03:22 +0100
Subject: [PATCH] fix(nix): when one nix hash update pushes now the other pulls
 (#1019)

---
 .github/workflows/update-nix-assets-hash.yaml    | 1 +
 .github/workflows/update-nix-pnpm-deps-hash.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/update-nix-assets-hash.yaml b/.github/workflows/update-nix-assets-hash.yaml
index 517be199f..bd0f42b31 100644
--- a/.github/workflows/update-nix-assets-hash.yaml
+++ b/.github/workflows/update-nix-assets-hash.yaml
@@ -41,3 +41,4 @@ jobs:
         with:
           commit_message: 'chore(nix): update assets hash'
           commit_author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
+          pull: '--rebase --autostash'
diff --git a/.github/workflows/update-nix-pnpm-deps-hash.yaml b/.github/workflows/update-nix-pnpm-deps-hash.yaml
index ddb32a3f0..7153aec22 100644
--- a/.github/workflows/update-nix-pnpm-deps-hash.yaml
+++ b/.github/workflows/update-nix-pnpm-deps-hash.yaml
@@ -40,3 +40,4 @@ jobs:
         with:
           commit_message: 'chore(nix): update pnpmDeps hash'
           commit_author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
+          pull: '--rebase --autostash'