From cbb91ed20d0a41a4a03d95a22983349dbaa3c2e7 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 14:11:32 +0200
Subject: [PATCH] fix(stack): record ChatMarkdown.tsx conflict resolution for
 auto-rebase

Stack sync fails replaying the root fork/changes commit onto
fork/candidates when ChatMarkdown diverges (markdown image / browser
link work vs candidates). Prefer the replayed fork/changes side via a
durable commit:\"*\" policy so the next sync auto-resolves.
---
 .github/pr-stack.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/pr-stack.json b/.github/pr-stack.json
index 2ac867e2186..d3f76d88b99 100644
--- a/.github/pr-stack.json
+++ b/.github/pr-stack.json
@@ -55,6 +55,18 @@
       "commit": "ce3318775d74c566b4eef309c3f374e6d220891d",
       "path": "packages/contracts/src/settings.test.ts",
       "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "*",
+      "path": "apps/web/src/components/ChatMarkdown.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "1f8a2c58ae115df840d98d5854825123c502d54c",
+      "path": "apps/web/src/components/ChatMarkdown.tsx",
+      "strategy": "theirs"
     }
   ]
 }