We use cookies to count visits and see which servers people install – only if you agree. Cookie policy

Necessary Remember your cookie choice and the client you picked for install snippets. Always on. cc_cookie, pd.client, __cf_bm Measurement Google Analytics counts visits and which pages people use. Off unless you accept. _ga, _ga_EJWRHLSGQ9

Skip to content

Servers Categories Best lists Tools About

plug.directory

Servers Categories Best lists Tools About

MCP clients Moving off Smithery MCP server API Data export

Imprint Terms Privacy Cookies Cookie settings Report a problem

Home
Git and code hosting
git-conflict-mcp
Tools

GC

git-conflict-mcp

by mattyateaio.github.mattyatea/git-conflict-mcpv1.12.5

How the score works

Runs on your machine
No known advisories

Overview Tools Security Alternatives

We have not seen this server list its tools yet.

plug.directory is a directory of MCP servers. Server data comes from the Official MCP Registry and public package registries, and every listing is ranked in the open.

Explore

All servers
Categories
MCP clients
Best lists
Tools
Compare

Use plug.directory

About
Add my server
MCP server
API
Data export
How we rank
Moving off Smithery

Legal

Imprint
Terms
Privacy
Cookies
Cookie settings
Acceptable use
Listing policy
Report a problem

plug.directory

Model Context Protocol and MCP are trademarks of LF Projects, LLC. plug.directory is independent and not affiliated with or endorsed by LF Projects, LLC or the Model Context Protocol project.