veto_merge_conflict
Resolve git merge conflicts by analyzing conflict markers and understanding the intent of both branches to produce a semantically correct result.
Instructions
Analyzes a file with git conflict markers and returns a semantically correct resolution by understanding the intent of both branches.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| file_path | Yes | Path to the file containing conflict markers. | |
| project_dir | No | Optional project directory for context. |