Base/current/incoming/result
Trinity keeps the four important views separate so the final file can be reviewed deliberately.
3-way merge tool
Conflict resolution with all sides visible.
Trinity is FluxGit's conflict workspace for reviewing base, current, incoming and final result. It is built for the moment when conflict markers are not enough and the safest move is to understand what each side changed before applying a resolution.
The problem: conflict markers compress too much context.
A merge conflict is not just two chunks of text. There is the original base, your current branch, the incoming branch and the resolved file you are about to commit. When that context is hidden, developers can accidentally delete intent from one side.
Honest beta limit
Trinity is in beta hardening. It does not promise automatic conflict resolution, and AI help should not be treated as safe without user review. Some conflict sessions may fall back to status-derived context when a full merge session is not hydrated.
How FluxGit helps.
Conflict never disappears silently
FluxGit surfaces conflict state in the cockpit so unresolved files do not hide inside a normal status list.
Manual choices remain explicit
Accept current, accept incoming or edit manually, with review before applying the result.
Privacy and security posture.
Conflict resolution is local-first. File content stays in your workspace unless you explicitly configure an AI provider or share diagnostics with consent. FluxGit should keep Git usable even when AI assistance is unavailable.
Related features.
- Safety rails add preflight context before merge and rebase flows.
- Semantic diff helps explain structural changes where supported.
- Fleet Radar can elevate repositories with potential conflict signals.