root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(FN-4397): complete Step 3 — treat unbound branch conflicts as stale-resolved

Browse Source 
Fusion-Task-Id: FN-4397
Fusion-Task-Lineage: 1ffac4f7-adf5-4115-b588-108d75eadde7
This commit is contained in:
Fusion
2026-05-13 15:56:16 -07:00
committed by gsxdsm
parent de7de9526a
commit e16af74ce4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/engine/src/branch-conflicts.ts
View File

@@ -225,7 +225,11 @@ export async function inspectBranchConflict(
return { kind: "stale-resolved" };
}
if (livePath && livePath !== input.conflictingWorktreePath) {
if (!livePath) {
return { kind: "stale-resolved" };
}
if (livePath !== input.conflictingWorktreePath) {
const tipSha = await revParse(input.repoDir, input.branchName);
const strandedCommits = await listStrandedCommits(input.repoDir, startPoint, input.branchName);
const taskAttributedCommitCount = await countTaskAttributedCommits(