atlas_smart_merge
Resolve Git merge conflicts with AI by understanding code intent from both branches. Detect semantic conflicts beyond text, generate tests, and score confidence for auto-application.
Instructions
AI-POWERED MERGE CONFLICT RESOLUTION
Automatically resolve merge conflicts using AI:
Automatically resolve merge conflicts using AI
Understand code intent from both branches
Detect semantic conflicts (not just textual)
Preserve functionality from both sides when possible
Generate test cases for merged code
Confidence scoring for auto-resolutions
Interactive suggestions for manual review
Integration with git workflow
Never waste hours on merge conflicts again - let AI handle them.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| autoResolve | No | Automatically apply resolutions (default: false) | |
| projectPath | Yes | Path to the git repository root | |
| generateTests | No | Generate test suggestions for resolved conflicts | |
| conflictedFiles | No | Specific conflicted files (auto-detected if not provided) | |
| confidenceThreshold | No | Minimum confidence for auto-resolution (0-1, default: 0.7) | |
| preserveBothWhenUnsure | No | Keep both versions when uncertain |