Git Conflict Manager MCP Server by mattyatea

MCP Servers Chevron right icon

Git Conflict Manager

Provider

mattyatea

Classification

community

Est. Downloads

This is our estimate of how many downloads occurred of this server across the MCP ecosystem (not specific to any single platform). We use a mix of publicly available data, social signals, and more to feed an algorithm that drives this estimation.

424

Released On

Dec 2, 2025

Popularity Ranking

Our estimate as to where this MCP server implementation ranks on the global leaderboard of usage.

#4,726 (#4,577 this week)

Streamlines Git merge conflict resolution by providing structured tools for identifying conflicted files, reading conflict content, and marking conflicts as resolved without direct command-line interaction.

GitHub Repo (3 stars)

Related Servers

Git

Anthropic

Interact with local Git repositories for version control tasks.

Classification

reference

Est Downloads (All Time)

745k

Release Date

Nov 19, 2024

Git Ingest

Adhika Setya Pramudita

Fetch and analyze git repository structures and contents.

Classification

community

Est Downloads (All Time)

42.4k

Release Date

Dec 15, 2024

Git

cyanheads

Integrates with Git repositories using simple-git to enable core version control operations like cloning, committing,...

Classification

community

Est Downloads (All Time)

21.8k

Release Date

Dec 16, 2024

Git File Forensics

David Orex

Provides deep git file-level forensics capabilities for tracking versions, analyzing diffs, examining commit...

Classification

community

Est Downloads (All Time)

—

Release Date

Feb 5, 2025

Git Forensics

David Orex

Provides deep git repository analysis tools for branch overview, time period examination, and merge recommendations...

Classification

community

Est Downloads (All Time)

282

Release Date

Feb 5, 2025

Code Analyzer

kivo360

Integrates with open source projects to analyze codebases, detect patterns, and generate intelligent merge strategies...

Classification

community

Est Downloads (All Time)

1.4k

Release Date

Feb 5, 2025

Git

Sheshiyer

Integrates with Git repositories to enable version control operations, code management, and collaborative development...

Classification

community

Est Downloads (All Time)

848

Release Date

Feb 13, 2025

Git Repo Browser

Razorback16

Integrates with Git repositories to provide efficient, deterministic access for retrieving directory structures and...

Classification

community

Est Downloads (All Time)

282

Release Date

Feb 18, 2025

Git

geropl

Integrates with Git repositories to enable version control operations and automation, supporting both shell-based...

Classification

community

Est Downloads (All Time)

4.2k

Release Date

Feb 28, 2025

Git Tools

lileeei

Integrates with Git to enable version control operations, repository management, and change tracking for...

Classification

community

Est Downloads (All Time)

989

Release Date

Mar 2, 2025

Git

Kristof Jozsa

Provides Git operations for local repositories, enabling repository management, tag handling, and repository...

Classification

community

Est Downloads (All Time)

4.9k

Release Date

Mar 5, 2025

GitHub Issue Resolver

Nimish Chaudhari

Automates GitHub issue resolution by analyzing repository code, creating resolution plans, and implementing solutions...

Classification

community

Est Downloads (All Time)

—

Release Date

Mar 19, 2025

GitLab MR Confluence Linker

Waqas

Bridges GitLab merge requests with Confluence documentation, enabling automatic retrieval, analysis, and structured...

Classification

community

Est Downloads (All Time)

—

Release Date

Mar 22, 2025

Git Summary

Cybersiddhu

Lightweight git commit message summary generator that analyzes repository histories by filtering commits and...

Classification

community

Est Downloads (All Time)

—

Release Date

Mar 26, 2025

Code Merge

yy1588133

Enables code analysis and merging from multiple files in a project with efficient handling of file trees, content...

Classification

community

Est Downloads (All Time)

3.1k

Release Date

Apr 9, 2025

GitLab Code Review

Mehmet Akin

Integrates with GitLab to enable code review of merge requests, allowing detailed analysis of diffs, commenting, and...

Classification

community

Est Downloads (All Time)

5.5k

Release Date

May 3, 2025

Git PR

peterj

Provides Git repository management and GitHub pull request automation through dual workflows for analyzing existing...

Classification

community

Est Downloads (All Time)

282

Release Date

Jun 5, 2025

GitLab

lucky-dersan

Integrates with GitLab repositories to enable comprehensive project management including repository operations,...

Classification

community

Est Downloads (All Time)

282

Release Date

Jul 3, 2025

GitLab

amirsina-mandegari

Integrates with GitLab's API to provide merge request management, code review workflows, and branch-based development...

Classification

community

Est Downloads (All Time)

2.4k

Release Date

Jul 16, 2025

Git Commit Generator

Theoklitos Bampouris

Generates conventional commit messages from staged git changes by analyzing diffs and file status to create properly...

Classification

community

Est Downloads (All Time)

1.9k

Release Date

Jul 2, 2025

File Control

PWalaGov

Provides comprehensive filesystem operations including directory analysis, content search, Git integration, and full...

Classification

community

Est Downloads (All Time)

565

Release Date

Aug 9, 2025

Merge Request Summarizer

Joe Luo

Automates git merge request analysis by categorizing commits, estimating review time, and generating structured...

Classification

community

Est Downloads (All Time)

141

Release Date

Aug 22, 2025

GitLab Code Review

lininn

Integrates with GitLab's REST API to provide merge request analysis, diff comparison, review comment management, and...

Classification

community

Est Downloads (All Time)

141

Release Date

Aug 27, 2025

ShadowGit

Alessandro Afloarei

Provides secure, read-only access to ShadowGit repositories with git operations like log, diff, blame, and grep to...

Classification

community

Est Downloads (All Time)

252

Release Date

Aug 29, 2025

GitLab

FitoDomik

Integrates with GitLab projects to provide merge request management, code review workflows, and CI/CD pipeline...

Classification

community

Est Downloads (All Time)

282

Release Date

Nov 29, 2025