Know what your team is changing before Git tells you.
MergeSense watches your team's Git activity in real time and warns you the moment you and a teammate are editing the same code, or about to, once your unmerged branches are compared. Long before either of you hits a merge conflict, a broken build, or a painful review comment.
The conflict you find at merge time was visible hours earlier
Two developers editing the same file happens constantly. Git just doesn't tell you until you try to merge. MergeSense watches for it live, and watches unmerged branches for it too, so it's a conversation instead of a surprise.
Know before you hit the conflict
Live collision detection catches two people editing overlapping lines right now. Branch-overlap detection catches it even earlier, before either of you has the file open, by diffing unmerged branches.
See exactly who, not just that something changed
The collision detail panel shows the other developer's name, branch, and line range, plus a risk score and band, so you know whether to keep going, compare changes, or say something.
Works from anywhere
Detection runs entirely through your configured MergeSense server, not local network discovery. Home, office, or VPN all behave identically, as long as the server is reachable.
A calculated risk, never a guess
Every score MergeSense shows says "Calculated, not certainty" out loud. Signal weights and risk bands are configurable per project, and the dashboard explains in plain language exactly how each score is built.
Never sees your source code
Git diffing and code-identity resolution happen entirely on your machine, inside the extension. Only metadata crosses the wire: branch name, HEAD commit, changed line ranges, a resolved symbol name. Never diff text, never file contents.
Own your data, own your infrastructure
Self-hosted with Docker Compose, backed by Postgres and Redis you control, the same architecture as every other PrashFlow product. Nothing about your team's activity leaves infrastructure you own.
Every team hits the same three walls
None of these are exotic edge cases. They happen on every team with more than one developer.
Conflicts discovered too late
You find out you were both editing the same file only when you try to merge, hours or days after either of you could have said something.
No idea who else is touching this file
Teams work heads-down and blind to each other's concurrent changes, with no signal until a pull request review turns up an ugly diff.
Line numbers shift, warnings vanish
A naive line-based tool loses track the moment someone edits above you. MergeSense's Java symbol-aware detection tracks the enclosing method instead, so a warning survives that drift.
Every collision, the same four steps
From sign-in to action, nothing requires touching your source code.
Sign in
A browser-based handoff, not a password prompt in VS Code. No credentials typed into the editor.
Detect
Live presence over WebSocket, plus a local Git diff against your merge-base, report only file paths and line ranges.
Score
A weighted risk score and band, LOW to CRITICAL, computed from configurable signals. Always labeled calculated, not certain.
Act
Continue Anyway, Compare Changes, Contact Developer, Dismiss, or, if enabled, Ask AI for a plain-language explanation.
What's actually built today
No roadmap items, no "coming soon." This is what runs in the extension and backend right now.
Live collision detection
The moment you and a teammate are editing overlapping lines of the same file, both of you see it: gutter markers, a status-bar indicator, a native notification, and the sidebar, all within one to two seconds.
Branch-overlap detection
MergeSense diffs your branch against its merge-base locally and flags overlaps with a teammate's unmerged branch before either of you opens the file live.
Symbol-aware detection (Java)
Collisions are tracked against the enclosing method or class via AST parsing, so a warning survives ordinary line drift. Java today; other languages are on the roadmap, not yet built.
Compare Changes, actual diffs
The detail panel's Compare Changes button runs two local Git diffs, yours and theirs, and renders them side by side. Nothing is sent to the backend to build this view.
Enterprise admin console
Platform admins manage every organization and user: block/unblock, reset a password (shown once), grant or revoke platform-admin status, and a global audit log. Org owners get the same tools scoped to their own organization, plus self-service create/delete for organizations and projects.
Browser-based login
Signing in opens the dashboard in your browser and hands a one-time code back to VS Code. Your password never touches the editor, and the token never appears in a URL.
Catch it before you even open the file
Live detection only sees two people editing at the same moment. Branch-overlap detection sees further: it compares your unmerged branch's changes against every other unmerged branch touching the same repository, even while you're both offline.
- Structural overlap: your diffs touch the exact same lines
- Branch overlap: same file, different lines, an earlier and weaker warning
- A pair only ever gets one signal per file at a time, never both at once
An explanation, not a dependency
Project admins can enable AI explanations by pointing MergeSense at their own AI gateway (any OpenAI-chat-completions-compatible endpoint, including an internal proxy) and providing an API key. Off by default. Nothing in core collision detection ever calls it.
- Sends only metadata: file path, collision type, line ranges, risk score, never source code
- API key encrypted at rest, never returned to the browser after saving
- A gateway outage never breaks live or branch-level detection, only the Ask AI button
The boundary is enforced by design, not policy
Git diffing and AST-based code-identity resolution happen entirely inside the extension, on your machine. The backend was never built to receive your source.
Your editor
full source, full diffs, stays localMergeSense server
branch · HEAD · line ranges · symbol nameYour dashboard
risk score, participants, no sourceYour infrastructure. Your data. Your control.
We deploy the full stack (Postgres, Redis, the Spring Boot backend, and the web dashboard) directly on infrastructure you own, and hand you the VS Code extension to roll out to your team. Nothing about your team's Git activity ever leaves your environment.
Questions, answered
See the conflict coming, not just the merge.
Self-hosted, metadata-only, and ready to roll out to your team today.