Git Conflict Manager

4

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
Category MCP Servers
Added Mar 28, 2026
Views 114

About

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.

Is this your product? Claim this listing with an email at your domain to post updates.

Is this your project?

Claim this listing to manage your page, access analytics, and unlock upgrades. Verification takes 60 seconds.

Log In to Claim

Share This Project

Share on X Share on LinkedIn

Embed Badge

Add this badge to your README:

[![Listed on AiList](https://hifriendbot.com/ai-list/badge/git-conflict-manager.svg)](https://hifriendbot.com/ai-list/git-conflict-manager/)
Listed on AiList

Compare

Git Conflict Manager vs GitWand Git Conflict Manager vs Git Repository Browser Git Conflict Manager vs Merge Request Summarizer

Similar Projects

GitWand

5

Native Git client with AI-powered merge conflict resolution, branch management, and commit analysis exposed as MCP tools.

MCP Servers

Git Repository Browser

2

Enables Git repository exploration and analysis through a Node.js server that executes commands for cloning repositories, browsing directories, reading files, comparing branches, and searching code patterns with structured JSON responses.

MCP Servers JavaScript

Merge Request Summarizer

1

Automates git merge request analysis by categorizing commits, estimating review time, and generating structured markdown or JSON summaries of changes between branches.

MCP Servers

List Your Project

Join the directory Ai agents read. Free forever.

Submit Your Project