Files
fusion/.changeset/fn-4397-branch-conflict-loop.md
gsxdsm e1bc0c2810 chore(FN-4152): import dependency content from fusion/fn-4315
Squash-imported the working tree of fusion/fn-4315 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-4152
Fusion-Task-Lineage: cd26df5e-92f2-431a-950e-84a0fd81bd1f
2026-05-13 21:41:14 -07:00

208 B

@runfusion/fusion
@runfusion/fusion
patch

Fix FN-4068 branch-conflict recovery hot loop: prevent repeated "Branch conflict recovery required" emissions and add a per-task tripwire that hard-pauses after 5 repeats.