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

feat(FN-4379): complete Step 2 — orphan-only scope recovery implementation

Browse Source 
Fusion-Task-Id: FN-4379
Fusion-Task-Lineage: 88ee0f49-1db2-40e6-8781-7ecbc4dcbdc8
This commit is contained in:
Fusion
2026-05-13 13:49:49 -07:00
committed by gsxdsm
parent 48c6343673
commit 4fe5792cf2
3 changed files with 208 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/types.ts
View File

@@ -1050,7 +1050,7 @@ export interface MergeDetails {
prNumber?: number;
mergeTargetBranch?: string;
mergeTargetSource?: "task-base-branch" | "task-branch-context" | "project-default" | "legacy-main";
resolutionStrategy?: "ai" | "auto-resolve" | "theirs" | "ours" | "abort";
resolutionStrategy?: "ai" | "auto-resolve" | "theirs" | "ours" | "abort" | "orphan-discard-no-op";
resolutionMethod?: "ai" | "auto" | "mixed" | "theirs" | "ours" | "abort";
attemptsMade?: 1 | 2 | 3;
autoResolvedCount?: number;