This MCP server provides a Git conflict resolution capability focused on cherry-picks. Based on its description, it performs three-way AST hunk alignment and resolves conflicts by ensuring non-overlapping block handling.
🛠️ Key Features
- Three-way AST hunk alignment
- Non-overlapping block conflict resolution for Git cherry-picks
🚀 Use Cases
- Resolving conflicts when performing
git cherry-pick - Aligning and reconciling AST hunks during cherry-pick operations
⚡ Developer Benefits
- Deterministic alignment strategy using three-way AST hunk alignment
- Conflict resolution approach aimed at non-overlapping blocks
⚠️ Limitations
- Scope is described specifically for Git cherry-picks and AST hunk alignment
- No additional supported tools, topics, or constraints are provided in the available server data