get_conflict_file
Read the content of one side of a conflicting file to understand the code and decide how to resolve the conflict. This read-only action supports informed merge conflict resolution.
Instructions
Read the content of one side of a conflicting file so you can decide how to resolve it. Read-only; does not resolve anything. When NOT to use: to choose a resolution (use resolve_conflicts).
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| mergeId | Yes | Id of the merge (from start_merge) | |
| fileName | Yes | Name of the conflicting file (from the conflict record) | |
| resolved | No | Fetch the resolved version instead of the original (default false) | |
| conflictId | Yes | Id of the conflict (from the merge's conflicts list) |