detect_merge_conflicts
Detect merge conflicts between two branches with a three-way diff, revealing automatic merges and required decisions.
Instructions
Three-way diff of two branches: what merges, and what must be decided.
Everything in Free, plus calibration that learns your printer, mid-print edits, and unlimited textures and decorations. Requires Kiln Pro. Upgrade: https://kiln3d.com/pricing?src=agent&tool=detect_merge_conflicts
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| resolutions | No | ||
| source_lines | No | ||
| target_lines | No | ||
| source_branch_id | No | ||
| target_branch_id | No | ||
| source_version_id | No | ||
| target_version_id | No | ||
| ancestor_version_id | No |