Capability
Merge And Rebase Operations With Conflict Resolution Support
9 artifacts provide this capability.
Want a personalized recommendation?
Find the best match →Top Matches
1
Git MCP ServerMCP Server44/100
Manage local Git repositories, commits, and branches via MCP.
Unique: Implements MCP tools for merge/rebase with three-way conflict detection and marker parsing. Provides conflict context (ours, theirs, base) for resolution guidance without automatic resolution.
vs others: More conflict-aware than raw git merge because it parses conflict markers and provides context; more flexible than IDE merge tools because it supports multiple merge strategies and rebase operations