gsxdsm 0c0839eeb6 fix(merger): retry on non-FF ref-advance instead of failing the task (FN-5576) ...

When the squash commit was built off a stale integration tip, the FF guard
in advanceIntegrationBranchRef refused the swap with reason
`non-fast-forward-advance` — but the caller only mapped `concurrent-advance`
to IntegrationBranchConcurrentAdvanceError, so the non-FF case fell through
as a plain Error and failed the task. Both reasons share a root cause
(integration moved during the merge window), so they now share the
FN-4500/FN-5083 rebind/retry path.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

2026-05-23 19:56:37 -07:00

..

src

fix(merger): retry on non-FF ref-advance instead of failing the task (FN-5576)

2026-05-23 19:56:37 -07:00

.gitignore

chore: consolidate test files into __tests__/ dirs and clean stray engine artifacts

2026-04-24 19:39:20 -07:00

CHANGELOG.md

chore(release): v0.32.0

2026-05-19 22:09:26 -07:00

MIGRATION_PLAN.md

feat(FN-1706): merge fusion/fn-1706

2026-04-13 16:35:06 -07:00

package.json

perf(engine): tier 4 slow real-git test files into engine-slow project

2026-05-23 07:47:17 -07:00

tsconfig.json

test: enforce test-directory isolation across all packages

2026-04-18 23:41:47 -07:00

vitest.config.ts

perf(engine): tier 4 slow real-git test files into engine-slow project

2026-05-23 07:47:17 -07:00