opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-09-19 10:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Kevin van Dijk
2026-02-23 20:12:28 +01:00
parent 3bade78c16 0e76652f28
commit ae62fff98d
298 changed files with 15340 additions and 5719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/beta.ts
+8 -3
View File
@@ -128,10 +128,15 @@ async function main() {
await $`git fetch origin beta`
const localTree = await $`git rev-parse beta^{tree}`.text()
const remoteTree = await $`git rev-parse origin/beta^{tree}`.text()
const remoteTrees = (await $`git log origin/dev..origin/beta --format=%T`.text()).split("\n")
if (localTree.trim() === remoteTree.trim()) {
console.log("Beta branch has identical contents, no push needed")
const matchIdx = remoteTrees.indexOf(localTree.trim())
if (matchIdx !== -1) {
if (matchIdx !== 0) {
console.log(`Beta branch contains this sync, but additional commits exist after it. Leaving beta branch as is.`)
} else {
console.log("Beta branch has identical contents, no push needed")
}
return
}