You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Base fixes can be turned on per machine. The User config gets base.fix (true or false, default false), validated like merge.always. With it true, every Run may start a Base fix with no flag. no-base-fix (or --no-base-fix) forbids it for one Run. Giving base-fix and no-base-fix together is rejected as contradictory, like merge and no-merge. Setup asks whether to allow Base fixes only when merging is on. Otherwise it writes base.fix out at its default, so the file still shows the setting.
Acceptance criteria
base.fix = true in the User config lets a Run start a Base fix without the flag.
no-base-fix overrides it for one Run; base-fix with no-base-fix is an error before any work.
A non-boolean base.fix is rejected with a message naming the file, like merge.always.
Setup asks about Base fixes when merging is on, skips the question otherwise, and always writes the setting.
Tested through the binary, following the User config, Setup and command surface tests.
Activity
JacobStephens2 commentedon Oct 1, 2026
Closed by #239, merged into issue-221 by a thirdshift Merge run.