osFoundry / Platform
Merge Station
A 3-way merge editor — mine, theirs, merged — for any branched entity in the workspace.
What it is
Merge Station is the conflict-resolution surface inside osFoundry, the bring-your-own-key desktop AI workspace. When two people (or two runs) both change the same thing, Merge Station opens a classic three-way view — your version on one side, their version on the other, and the reconciled result in the middle — so you can decide, hunk by hunk, what the merged entity should be. It is the same mental model developers know from git merge tools, but applied across the whole workspace rather than just source files.
What makes it different from a code diff tool is the range of things it can merge. In osFoundry almost anything can be branched: an agent's configuration, an app, a document, a canvas, a knowledge collection, a prompt or loop definition. Each of those is a structured entity, and each can diverge when two branches evolve in parallel. Merge Station reads both sides plus their common ancestor, auto-merges the parts that don't conflict, and puts the genuine conflicts in front of you to choose. You take mine, take theirs, or edit the merged pane directly until it reads the way you want, then commit the result back as the reconciled version.
Because osFoundry is local-first and BYOK, merging happens in your workspace on your device — the entities, their history, and the merge you produce stay where your work already lives, and no reseller sits between you and your model keys. For a team collaborating on shared agents and apps without per-seat fees, Merge Station is the step that lets two branches of the same thing come back together cleanly instead of one person's work silently overwriting another's.
Key capabilities
- Three-pane 3-way merge view: mine, theirs, and the editable merged result side by side
- Works on any branched entity — agents, apps, documents, canvases, knowledge, prompts and loops, not just code
- Uses the common ancestor to auto-merge non-conflicting changes and surface only the real conflicts
- Resolve each conflict by taking mine, taking theirs, or editing the merged pane directly
- Runs locally in your BYOK desktop workspace, so branch history and merges stay on your device
Use cases
- Team lead: two teammates edited the same shared agent on separate branches; open Merge Station to reconcile their prompt and tool changes into one version
- App builder: merge a feature branch of a workspace app back into main, choosing per-conflict which side to keep
- Knowledge owner: combine parallel edits to a shared document or knowledge collection without one revision clobbering the other
Frequently asked questions
What is a 3-way merge and why three panes?
A 3-way merge compares two diverged versions against their common ancestor, so the tool can tell which side actually changed a given part instead of guessing. Merge Station shows mine, theirs, and the merged result: non-conflicting changes flow in automatically, and only true conflicts need your decision in the middle pane.
Can Merge Station merge things other than code?
Yes. It works on any branched entity in the osFoundry workspace — agents, apps, documents, canvases, knowledge collections, prompts and loops. If something can be branched, its two versions can be reconciled in Merge Station.
Where does the merge run, and does my data leave my device?
osFoundry is a local-first, bring-your-own-key desktop workspace, so Merge Station operates on the entities and history already in your workspace on your machine. The merge you produce is committed back locally; there is no reseller in the middle.