From 6cf5b660bab3d1882525929fb003ec2014d68665 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 15:42:05 +0200
Subject: [PATCH] fix(stack): record fork/integration pnpm-lock.yaml conflict
 resolution

Stack sync rebases the prior integration tip onto the new fork/changes
base before compose. Overlay commits that touch the lockfile (e.g. #120)
conflict there; prefer the replayed side via durable commit:\"*\" so
compose can continue and regenerate the integration lock at the end.
---
 .github/pr-stack.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/pr-stack.json b/.github/pr-stack.json
index ad187c2028f..232a53d001a 100644
--- a/.github/pr-stack.json
+++ b/.github/pr-stack.json
@@ -79,6 +79,18 @@
       "commit": "4d97aafb8e216dd27b6835b13ad20fca2884691e",
       "path": "apps/mobile/src/features/home/HomeScreen.tsx",
       "strategy": "theirs"
+    },
+    {
+      "branch": "fork/integration",
+      "commit": "*",
+      "path": "pnpm-lock.yaml",
+      "strategy": "theirs"
+    },
+    {
+      "branch": "fork/integration",
+      "commit": "286efa51172d3cbf46684c9923ca9d2b003d0967",
+      "path": "pnpm-lock.yaml",
+      "strategy": "theirs"
     }
   ]
 }