veto_merge_conflict
Resolve Git conflicts by analyzing both branches' intent, returning a semantically correct merged file. Provide the file path with conflict markers for an accurate resolution.
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. |