From 6352beb85eb85bb47c40ed6f59d9247354675966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Catriel=20M=C3=BCller?= Date: Tue, 3 Feb 2026 14:25:14 -0300 Subject: [PATCH] fix: use commit hash directly for conflict analysis instead of upstream/tag ref --- script/upstream/merge.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/script/upstream/merge.ts b/script/upstream/merge.ts index 50f1b491dd..1a31ab1492 100644 --- a/script/upstream/merge.ts +++ b/script/upstream/merge.ts @@ -156,12 +156,9 @@ async function main() { // Step 4: Generate conflict report logger.step(4, 8, "Analyzing potential conflicts...") - const conflicts = await report.analyzeConflicts( - `upstream/${targetVersion.tag}`, - config.baseBranch, - config.keepOurs, - config.skipFiles, - ) + // Use the commit hash or tag directly (tags are fetched, not remote refs) + const upstreamRef = targetVersion.commit || targetVersion.tag + const conflicts = await report.analyzeConflicts(upstreamRef, config.baseBranch, config.keepOurs, config.skipFiles) const conflictReport: report.ConflictReport = { timestamp: new Date().toISOString(),