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

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

Browse Source 
- test(FN-2944): cover already checked out worktree conflict recovery
- fix(FN-2944): recognize git already checked out worktree conflict
- fix(engine): auto-recover from squash-merge orphan rebase failures

Fusion-Task-Id: FN-2944
This commit is contained in:
Fusion
2026-04-29 07:10:52 -07:00
committed by gsxdsm
parent a74b77cec5
commit ba3d868c2d
46 changed files with 454 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/examples/fusion-plugin-auto-label/vitest.config.ts
View File

@@ -1,4 +1,5 @@
import { defineConfig } from "vitest/config";
import { fileURLToPath } from "node:url";
const requestedMaxWorkers = Number.parseInt(process.env.VITEST_MAX_WORKERS ?? "2", 10);
const maxWorkers = Math.max(1, Math.min(4, Number.isFinite(requestedMaxWorkers) ? requestedMaxWorkers : 2));
@@ -7,8 +8,8 @@ process.env.VITEST_MAX_WORKERS = String(maxWorkers);
export default defineConfig({
resolve: {
alias: {
"@fusion/core": new URL("../../../packages/core/src/index.ts", import.meta.url).pathname,
"@fusion/plugin-sdk": new URL("../../../packages/plugin-sdk/src/index.ts", import.meta.url).pathname,
"@fusion/core": fileURLToPath(new URL("../../../packages/core/src/index.ts", import.meta.url)),
"@fusion/plugin-sdk": fileURLToPath(new URL("../../../packages/plugin-sdk/src/index.ts", import.meta.url)),
},
},
test: {