feat(FN-2160): add push-after-merge remote sync workflow

- Add project settings for pushAfterMerge and pushRemote with defaults and typed merge result fields for push status/errors
- Implement post-merge remote sync in the merger with pull --rebase, auto/AI conflict resolution, and one non-fast-forward retry before push
- Expose push-after-merge controls in Settings modal with conditional Push Remote input and coverage for desktop/mobile save flows
- Document the new settings in the settings reference and stabilize CLI cross-build help test timeout
This commit is contained in:
Fusion
2026-04-19 13:29:59 -07:00
committed by gsxdsm
parent 4c08b1c32a
commit a93f0f2ef9
9 changed files with 821 additions and 1 deletions

View File

@@ -134,7 +134,7 @@ describe("build-exe-cross: --all builds all platforms", () => {
}
expect(result.status).toBe(0);
expect(result.stdout).toContain("fn");
});
}, 20_000);
});
describe("build-exe-cross: default (no args) backward compatibility", () => {