opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-08-29 03:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): case-insensitive match for resolve merge conflict subject

Browse Source
This commit is contained in:
kirillk
2026-04-09 13:06:30 -04:00
parent c02addb544
commit 258fbc4e16
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/check-opencode-annotations.ts
+2 -1
View File
@@ -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")
})
}