opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-08-31 01:37:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): also detect Resolve merge conflict commits as upstream merges

Browse Source
This commit is contained in:
kirillk
2026-04-09 13:05:25 -04:00
parent b42fdc3235
commit c02addb544
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
@@ -54,7 +54,8 @@ function isUpstreamMerge() {
const out = run("git", ["log", "--format=%P%x09%s", `${base}..HEAD`])
return out.split("\n").some((line) => {
const [parents = "", subject = ""] = line.split("\t")
return parents.includes(" ") && subject.startsWith("merge: upstream ")
if (!parents.includes(" ")) return false
return subject.startsWith("merge: upstream ") || subject.startsWith("Resolve merge conflict")
})
}