get_conflicts
Identify overlapping changes and collisions caught in a shared Git checkout to resolve conflicts before committing.
Instructions
Show overlapping/shared changes and collisions that were caught.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| actor | No | actor id to act as. Auto-derived per connection when omitted (from the client name, e.g. cursor-3fa2), so naming is optional for a single agent. Pass an explicit id (your role/task name) when several subagents share one server — they have no ambient identity to tell them apart — or when you want a stable id across runs. |