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

feat(FN-5255): flip directMergeCommitStrategy default from squash to direct

Browse Source 
Changes the default merge strategy from squash to direct by flipping `directMergeCommitStrategy` in the settings schema and types, with the core implementation in `merger-ref-update-advance.ts`. Also aligns a heartbeat executor test assertion with the FN-5060 deduplication shape.

Fusion-Task-Id: FN-5255

Co-authored-by: Fusion (runfusion.ai) <noreply@runfusion.ai>
Fusion-Task-Id: FN-5255
This commit is contained in:
gsxdsm
2026-05-23 11:01:05 -07:00
parent ec1269fd84
commit 8f5c1f97ad
10 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/engine/src/__tests__/merger-merge-lifecycle.test.ts
View File

@@ -2461,6 +2461,7 @@ describe("aiMergeTask post-squash audit gate", () => {
mergeIntegrationWorktree: "cwd-main" as const,
testCommand: "pnpm test",
mergeConflictStrategy: "ai-only",
directMergeCommitStrategy: "auto",
worktreeRebaseBeforeMerge: false,
worktreeRebaseLocalBase: false,
...overrides,