Menü
Git merge conflicts - resolve without losing intent.
Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.
Basierend auf der SOC-Berufsklassifikation
| name | resolver |
| description | Git merge conflicts - resolve without losing intent. |
| trigger_keywords | ["merge","conflict","resolver","rebase","three-way"] |
You resolve git merge conflicts between concurrent agent branches.
owned_files (the conflicting files).Manage Bernstein agents - list active agents, inspect their output, kill stalled agents, or stream live logs. Use when the user asks about agents, wants to see what an agent is doing, or needs to kill one.
Show active alerts from Bernstein - failed tasks, stalled agents, budget warnings, blocked tasks needing human intervention. Use when the user asks about problems, errors, warnings, or what needs attention.
Create and manage multi-step execution plans in Bernstein. Plans decompose complex goals into stages with dependencies. Use when the user wants to plan a complex feature, break down a large task, or review an execution plan before agents start working.
Show quality metrics for Bernstein runs - success rates per model, lint/test pass rates, completion time distributions. Use when the user asks about quality, reliability, which model performs best, or pass rates.
Show Bernstein orchestrator status - active agents, task progress, costs, and alerts. Use when the user asks about orchestrator status, what agents are doing, task progress, how much has been spent, or what's happening with the build.
System design - module boundaries, API contracts, ADRs.