Skip to main content
Glama

git_conflicts

Identify files with merge conflicts in Git working tree during merge or rebase operations to resolve version control issues.

Instructions

Detect files with merge conflicts in working tree. Use during merge/rebase to find issues.

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault

No arguments

Other Tools

Latest Blog Posts

MCP directory API

We provide all the information about MCP servers via our MCP API.

curl -X GET 'https://glama.ai/api/mcp/v1/servers/ShunsukeHayashi/miyabi-mcp-bundle'

If you have feedback or need assistance with the MCP directory API, please join our Discord server