Resolve merge conflicts using a specific strategy
AI agents invoke treehouse_resolve to trigger actions in Treehouse Worktree. What it does depends on the arguments the agent supplies, and its effects often reach beyond the immediate call — builds kicked off, notifications sent, workflows started.
Resolving merge conflicts by applying a strategy actively modifies file contents and git state in a way that could overwrite changes depending on the chosen strategy (e.g., 'ours' or 'theirs'). This is an operation that executes a decision process with significant consequences, potentially discarding one side of conflicting changes.
From the tool's definition 'Resolve merge conflicts using a specific strategy' — triggers automated conflict resolution logic that modifies repository state based on chosen strategy
Attacks that exploit this kind of access
Resolve merge conflicts using a specific strategy. It is categorised as a Execute tool in the Treehouse Worktree MCP Server, which means it can trigger actions or run processes. Use rate limits and argument validation.
Register the Treehouse Worktree MCP server in PolicyLayer and add a rule for treehouse_resolve: allow, deny, rate-limit, or require approval. Point your MCP client at the PolicyLayer proxy URL and the rule is enforced on every call, before it reaches Treehouse Worktree. Nothing to install.
treehouse_resolve is a Execute tool with high risk. Execute tools should be rate-limited and have argument validation enabled.
Yes. Add a rate_limit block to the treehouse_resolve rule in your PolicyLayer policy. For example, setting max: 10 and window: 60 limits the tool to 10 calls per minute. Rate limits are tracked per agent session and reset automatically.
Set action: deny in the PolicyLayer policy for treehouse_resolve. The AI agent will receive a policy violation error and cannot call the tool. You can also include a reason field to explain why the tool is blocked.
treehouse_resolve is provided by the Treehouse Worktree MCP server (mark-hingston/treehouse-worktree). PolicyLayer sits as a proxy in front of this server to enforce policies before tool calls reach the server.
Every MCP server has a record like this.
Type a name, get the same breakdown: verified identity, auth posture, risk grade, capabilities, recommended policy.
Teams ship this data inside their own products. See what a licence covers →