From 11f687967f5fc0789b8542dc605d9c2d03caeb92 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:15:01 +0200 Subject: [PATCH] fix(stack): record HomeScreen.tsx conflict resolution for auto-rebase After ChatMarkdown, stack sync still stops replaying fork/changes onto fork/candidates on apps/mobile HomeScreen (Recent/Projects/Board rewrite). Prefer the replayed fork/changes side with a durable commit:\"*\" policy. --- .github/pr-stack.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/pr-stack.json b/.github/pr-stack.json index d3f76d88b99..ad187c2028f 100644 --- a/.github/pr-stack.json +++ b/.github/pr-stack.json @@ -67,6 +67,18 @@ "commit": "1f8a2c58ae115df840d98d5854825123c502d54c", "path": "apps/web/src/components/ChatMarkdown.tsx", "strategy": "theirs" + }, + { + "branch": "fork/changes", + "commit": "*", + "path": "apps/mobile/src/features/home/HomeScreen.tsx", + "strategy": "theirs" + }, + { + "branch": "fork/changes", + "commit": "4d97aafb8e216dd27b6835b13ad20fca2884691e", + "path": "apps/mobile/src/features/home/HomeScreen.tsx", + "strategy": "theirs" } ] }