integration preflight

See likely conflicts before you merge.

FluxGit's conflict prediction runs a read-only integration preflight so you learn which files are likely to conflict before starting a merge or rebase, not in the middle of one.

Request beta accessSee Trinity resolution
FluxGit Fleet Radar elevating a synthetic demo repository with a potential-conflict signal
Real FluxGit interface · synthetic demo data

The problem: conflicts surprise you mid-operation.

Starting a merge or rebase and only then discovering a painful conflict wastes time and raises the chance of a messy resolution. Knowing the risk up front lets you choose a safer path.

Honest beta limit

Conflict prediction is a read-only preflight in beta. It estimates likely conflicts and does not guarantee every conflict; strong commit-by-commit rebase prediction needs deeper simulation, and installed smoke is still in progress.

How FluxGit helps.

merge/rebasebeta

Preflight in the dialog

A preflight card appears in merge and rebase dialogs before you confirm the operation.

fleetbeta

Elevated in Fleet Radar

Repositories with potential-conflict signals are raised in the attention stack.

agentsbeta

Available read-only via MCP

Agents can query conflict preflight read-only through repo.conflictPreflight.

Privacy and security posture.

Preflight runs locally and read-only. It inspects your repositories without sending paths, diffs or commits anywhere.

Related features.