From 258fbc4e161ba189471ec5a7dcee7b1a092f00ba Mon Sep 17 00:00:00 2001 From: kirillk Date: Thu, 9 Apr 2026 13:06:30 -0400 Subject: [PATCH] fix(cli): case-insensitive match for resolve merge conflict subject --- script/check-opencode-annotations.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/check-opencode-annotations.ts b/script/check-opencode-annotations.ts index 9ac20d5686..1a5bb8165d 100644 --- a/script/check-opencode-annotations.ts +++ b/script/check-opencode-annotations.ts @@ -55,7 +55,8 @@ function isUpstreamMerge() { return out.split("\n").some((line) => { const [parents = "", subject = ""] = line.split("\t") if (!parents.includes(" ")) return false - return subject.startsWith("merge: upstream ") || subject.startsWith("Resolve merge conflict") + const s = subject.toLowerCase() + return s.startsWith("merge: upstream ") || s.startsWith("resolve merge conflict") }) }