From fc07f09e77ad82c51044f9c55ade5702c45da916 Mon Sep 17 00:00:00 2001
From: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 12:10:32 +0200
Subject: [PATCH] fix(stack): record settings.test.ts conflict resolution for
 auto-rebase

Stack sync fails replaying fork/changes onto candidates at
ce3318775 (restore recent work queue) on packages/contracts/src/settings.test.ts.
Take theirs (downstream) as a durable * policy so the next upstream sync can proceed.
---
 .github/pr-stack.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/pr-stack.json b/.github/pr-stack.json
index 5ea5c91b770..2ac867e2186 100644
--- a/.github/pr-stack.json
+++ b/.github/pr-stack.json
@@ -43,6 +43,18 @@
       "commit": "*",
       "path": "apps/mobile/src/lib/threadActivity.ts",
       "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "*",
+      "path": "packages/contracts/src/settings.test.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "ce3318775d74c566b4eef309c3f374e6d220891d",
+      "path": "packages/contracts/src/settings.test.ts",
+      "strategy": "theirs"
     }
   ]
 }