Enhanced MCP server for Limitless Pendant with advanced conversation analysis, meeting detection, action item extraction, and comprehensive
Free
Nothing to run from here
Git Conflict is installed from its publisher's own source and answers where it runs, so this marketplace is not in the path of a single call. There is no address here to send one to, and a panel that pretended otherwise would be showing you an answer we made up. Install it and call it from your own client — the Installation tab has the entry for each one.
Open Installation—
p95 latency
—
call success
local
runs on your machine
—
calls last 7d
What it does
A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution.
Quickstart
# 1 — run it from where its publisher ships it
npx -y git-conflict-mcp
# 2 — ask your agent something
> A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It
Git Conflict is free: there is no plan to choose, no cap to set and nothing that can bill you.
Publishernot claimed
MAAll 1 server
mattyatea1 server
1 category
Collected from a public index. Nobody has claimed this account, so nothing here was written by its author — claim it if it is yours.
Installation
Where are you running it?
Every route below installs the same thing and ends at the same approval screen. This one runs on your machine: your client starts Git Conflict as a process under your own user, with your files and your network, so the tool surface below is what it can do to your computer rather than to a server somewhere else. It is scanned, signed and pinned to the version you choose — read the surface before you approve it.
Claude Codedeclared by this listing
This is a public server: you run it yourself and this marketplace is not in the path. Claude Code registers it in one command.
claude mcp add git-conflict-mcp -- npx -y git-conflict-mcpReconnect, or start a new session, and the tools appear in the model’s tool list.
Free to install, and it runs from its publisher’s own package: no account, no key, no card.
What it writes
One config entry your client uses to start the process locally. A local server runs with your file system and your network, which is why it is priced without metering.
What you approve
This listing has not published its tool surface here yet, so what a client will ask you to approve is whatever the manifest declares at install time.
Tool surface
What the model actually sees. Descriptions are diffed on every release — see version history.
No tool surface on file
The catalogue records 0 tools on this listing, and the manifest behind them has not been imported into the marketplace yet. Nothing is shown here rather than another listing’s tools, which is what this page used to do.
Freeyour plan
$0 forever
- Every tool, no call limit
- No card, no account needed
- Source published under a licence you can read
- Runs on your machine — nothing of it reaches our gateway
- Nothing to cap, because nothing bills
What counts against your monthly calls
| Tool | Unit | Calls used | Out of the allowance |
|---|
Nothing here is billable. Git Conflict costs nothing to install and nothing to call, at any volume.
Call allowance · this installenforced at the gateway
Monthly allowance, in calls
—
—
Alert at 80% · then the tool returns a normal MCP error
Used this month: $8.42
$16.58 left
ATrust score 93 / 100
Release 1.12.5 · scanned 25 Aug 2026
Two independent axes, because powerful and malicious are different questions. The grade is threat only. The capability level is blast radius, and it is never a penalty on the grade — it is priced as one subtract-only term in the score, where you can see it.
Threat score100
Client score93
Findings1 threat · 5 capability
Capabilityhigh
Coveragesource
Verificationrepo
Surface digestab9dd2002db9e8a6caeed007d610114ca01a97e7b2c5e41355f678d3c29b3eaa
Score vectorthreat 100 → client 93
| Term | Level | What it prices | Points |
|---|---|---|---|
| capability-exposure | high | capability blast radius (high) — client exposure if the model is manipulated | −6 |
| verification-discount | repo | publisher verification (public source) — no provenance, but the source is public and inspectable | −1 |
| coverage-honesty | source | inspection depth (source) — how much of the target the scan could see | −0 |
score = clamp(round(threatScore − E_cap − E_ver − E_cov), 0, 100). No model, no opinion, no network call at scoring time: the same methodology version against the same bytes always produces this number, and every line above is a field of the report rather than a summary of it.
What the scan could actually read
A grade is only as meaningful as its coverage, so the scanner publishes its own depth before it publishes its result.
Tool surfaceread
Implementation sourceread
Package metadataread
Live transportnot available
Tools were statically extracted from the published source (8 recovered), not enumerated from a running server. Tool-poisoning, Unicode-smuggling, capability and toxic-flow analysis ran on this inferred surface, but a mis-parsed registration could be missed or mis-attributed, so tool-derived findings are capped below “confirmed”. To grade the real runtime surface, scan the running server: --command "npx -y <package>".
Capability — what it could do if the model were manipulated
Tags derived from each tool’s schema and the implementation, not from what the tool calls itself. high is the level these add up to.
| Tool | Capability tags | Why the tag was assigned |
|---|---|---|
| init_project | no tags | |
| list_conflicts | sensitive-source | |
| list_pending_resolutions | no tags | |
| post_resolve | no tags | |
| read_conflict | no tags | |
| read_pending_resolution | no tags | |
| resolve_conflict | no tags | |
| resolve_pending_resolution | no tags |
Toxic-flow graph
The lethal trifecta, checked as a graph rather than as a checklist: untrusted input, a sensitive source and an external sink have to meet before there is a path worth worrying about.
The public result for this release does not print the flow graph, so there is nothing to show here. That is not the same as "no paths were found": what the scan did read is above, under coverage.
Supply chain and provenance
Integrityfirst-seen
Surface digestab9dd2002db9e8a6
Scanned2026-08-25
This is the first scan of this surface here, so there is nothing yet to compare it against.
Every result on this tab comes from one deterministic pass over the published package — offline, rule by rule, and auditable line by line above. Same methodology version, same bytes, same score.
Release history
Pinned to 1.12.5 — the install command below asks for that release. A pin is part of an install, so it is kept for this visit and written down when you install.
1.12.5
undated
installedNo release note was published with this version.
—
no reviews yet
Reviews are earned
Only accounts with at least 50 real tool calls against this server in the last 90 days can post. Ratings are weighted by how much the reviewer actually uses it, and publishers can reply once per review.
Reviews are earned
Writing one takes an account with at least 50 real tool calls against Git Conflict in the last 90 days. That is the whole gate — there is no other way to post, which is why the counts beside each review are worth reading.
No reviews yet
Nobody has reviewed this listing. The rating on the card is the mean of the reviews written here and nothing else, so there is no rating until somebody writes the first — which takes an account with 50 real tool calls against it.