3 Commits

Author	SHA1	Message	Date
Fusion	e16af74ce4	fix(FN-4397): complete Step 3 — treat unbound branch conflicts as stale-resolved ... Fusion-Task-Id: FN-4397 Fusion-Task-Lineage: 1ffac4f7-adf5-4115-b588-108d75eadde7	2026-05-13 16:58:35 -07:00
gsxdsm	22fee60aee	chore(FN-4350): import dependency content from fusion/fn-4326 ... Squash-imported the working tree of fusion/fn-4326 as a single commit so this branch carries the dep's content without inheriting its individual commits. If the dep is later squash-merged to main, this commit's patch-id should match the merge and rebase cleanly. Fusion-Task-Id: FN-4350 Fusion-Task-Lineage: 11fff2c2-1cd1-4562-9b01-032a15217479	2026-05-13 12:30:45 -07:00
Fusion	bddcc3a931	feat(FN-4068): add branch conflict detection and recovery for stale worktre ... Implements branch conflict detection and recovery across the Fusion engine, CLI, and dashboard — surfacing git worktree conflicts when tasks conflict with unrelated branch state, and providing a recovery workflow to resolve them. The executor and worktree pool now integrate typed branch conflict che Fusion-Task-Id: FN-4068	2026-05-12 17:14:29 -07:00