Agent-Skills.md

Agent Skills: resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

UncategorizedID: zenobi-us/dotfiles/resolving-merge-conflicts

Repository

zenobi-us/dotfiles
zenobi-usLicense: MIT
676

Install this agent skill to your local

pnpm dlx add-skill https://github.com/zenobi-us/dotfiles/tree/HEAD/devtools/files/agent/bundles/matt-pocock/skills/resolving-merge-conflicts

Skill Files

Browse the full folder contents for resolving-merge-conflicts.

Download Skill

Loading file tree…

devtools/files/agent/bundles/matt-pocock/skills/resolving-merge-conflicts/SKILL.md

Skill Metadata

Name
resolving-merge-conflicts
Description
"Use when you need to resolve an in-progress git merge/rebase conflict."

Language

All agent-authored prose MUST follow ASD-STE100 Simplified Technical English. Apply it to questions, explanations, recommendations, issue text, reports, handoffs, and procedures.

  • Use short, complete sentences and active voice.
  • Use one term for one meaning.
  • Put conditions before commands.
  • Use imperative sentences for procedures.
  • Keep code, identifiers, commands, quoted text, product names, and exact domain terms unchanged.
  • Use the simple-english skill for the full rule set.

Local repository rules

Before reading or writing workflow or domain artifacts:

  1. Follow ALIGNMENT-ROOT.md.

  2. Resolve alignment paths against ALIGNMENT_ROOT.

  3. Keep source code and ordinary project files relative to repository-root.

  4. Do not silently mix alignment roots.

  5. All agent-authored prose MUST follow ASD-STE100 Simplified Technical English.

  6. See the current state of the merge/rebase. Check git history, and the conflicting files.

  7. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

  8. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.

  9. Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.

  10. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.