Merge branch 'claudedo/75514ee68371402b814638290af47cca'

2026-08-06 12:11:38 +02:00
parent 0358bcf8b2 5d1d2d89d0
commit 20bce9b424
15 changed files with 379 additions and 14 deletions
@@ -632,6 +632,10 @@
    },
    "staleWorker": {
      "message": "The worker is running an older build than this repo's merged main — restart it so your merged changes take effect."
+    },
+    "externalMerge": {
+      "banner": "A Claude session is resolving a merge conflict — don't edit files in the repository.",
+      "open": "Open resolver"
    }
  },
  "vm": {