fleet-merge¶
fleet-merge is a local branch merge manager for the fleet. It serializes landing to a target branch with an explicit JSON lease and refuses to land unreviewed, concurrently owned, dirty, non-fast-forward, or file-dropping changes.
Commands¶
fm claim <repo> --branch <target> --ticket <T> [--ttl-min N]
fm release <repo> --branch <target>
fm queue <repo> --branch <target>
fm land <repo> --from <branch> --into <target>
fm status
The default lease file is %USERPROFILE%\.fleet-merge\leases.json. Set FLEET_MERGE_LEASES to use another JSON file, and set FLEET_MERGE_OWNER to override the default holder identity of <user>@<machine>.
Review Gate Marker¶
Before fm land will merge a source branch, the source branch head SHA must have a marker at:
<repo>\.fleet-merge\gates\<sha>.json
Marker format:
{
"sha": "40-character source branch head SHA",
"branch": "wt/FLT-202/init",
"ticket": "FLT-202",
"reviewedAtUtc": "2026-08-06T00:00:00Z",
"reviewer": "council-code-review",
"result": "approved"
}
This tool only verifies the marker. It does not call or simulate a review tool.