From 26db738e4975991db005fb0a754909062fc940d2 Mon Sep 17 00:00:00 2001
From: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2026 09:18:18 +0200
Subject: [PATCH] fix(stack): durable conflictResolutions for upstream main
 rebase

Unblock sync onto latest upstream by recording auto-resolve policies for
fork/tim (GitVcsDriverCore test, vcs.ts, BranchToolbar), fork/candidates
(SidebarV2), and fork/changes (ws, CommandPalette, package.json), plus
existing integration AGENTS/lock policies. Local sync --dry-run succeeds.
---
 .github/pr-stack.json | 84 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/.github/pr-stack.json b/.github/pr-stack.json
index b988a60872e..36f18acb790 100644
--- a/.github/pr-stack.json
+++ b/.github/pr-stack.json
@@ -121,6 +121,90 @@
       "commit": "206981716ef30b5fb58338e32653339ed958a7f7",
       "path": "AGENTS.md",
       "strategy": "theirs"
+    },
+    {
+      "branch": "fork/tim",
+      "commit": "*",
+      "path": "apps/server/src/vcs/GitVcsDriverCore.test.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/tim",
+      "commit": "17c1de988fcc3db7fbb98cd2544c959ed5a9590a",
+      "path": "apps/server/src/vcs/GitVcsDriverCore.test.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/tim",
+      "commit": "*",
+      "path": "packages/client-runtime/src/state/vcs.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/tim",
+      "commit": "1b0f3a0e84537949b552e71005410416bbc09440",
+      "path": "packages/client-runtime/src/state/vcs.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/tim",
+      "commit": "*",
+      "path": "apps/web/src/components/BranchToolbarBranchSelector.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/tim",
+      "commit": "38fa39edcfe2fff33eb966541c80403fcc17b97c",
+      "path": "apps/web/src/components/BranchToolbarBranchSelector.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/candidates",
+      "commit": "*",
+      "path": "apps/web/src/components/SidebarV2.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/candidates",
+      "commit": "0cf437e7681face0550d5f9620b58f7b6327e57f",
+      "path": "apps/web/src/components/SidebarV2.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "*",
+      "path": "apps/server/src/ws.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "d21149c3666035d6afd61fbc87b4e6ceac2314e8",
+      "path": "apps/server/src/ws.ts",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "*",
+      "path": "apps/web/src/components/CommandPalette.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "d21149c3666035d6afd61fbc87b4e6ceac2314e8",
+      "path": "apps/web/src/components/CommandPalette.tsx",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "*",
+      "path": "package.json",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/changes",
+      "commit": "d21149c3666035d6afd61fbc87b4e6ceac2314e8",
+      "path": "package.json",
+      "strategy": "theirs"
     }
   ]
 }