Menu
Resolve git merge conflicts by semantically merging both sides of each conflict. Use when the user has merge conflicts, asks to resolve conflicts, or is stuck in a merge/rebase with conflict markers.
Instalar com Codex ou Claude Copie este prompt, cole no Codex, Claude ou outro assistente e deixe que ele revise a página da skill e instale para você.
Baseado na classificação ocupacional SOC
| name | conflicts-resolve |
| description | Resolve git merge conflicts by semantically merging both sides of each conflict. Use when the user has merge conflicts, asks to resolve conflicts, or is stuck in a merge/rebase with conflict markers. |
Resolve git merge conflicts by semantically merging both sides. Do every step yourself, end to end.
Optional target branch name. Defaults to the repo's default branch (main/master/develop).
git rev-parse --git-dir > /dev/null 2>&1 || { echo "Error: not a git repository"; exit 1; }
If no conflicts exist (git diff --name-only --diff-filter=U is empty), report "No conflicts found" and stop.
Use the argument if provided. Otherwise detect:
git remote show origin 2>/dev/null | grep 'HEAD branch' | awk '{print $NF}'
Fallback order if that fails: main → master → develop → first remote branch.
git branch --show-current
git diff --name-only --diff-filter=U
git log --oneline -10 HEAD
git log --oneline -10 <target-branch>
git merge-base HEAD <target-branch>
For every file in git diff --name-only --diff-filter=U:
<<<<<<< … ======= … >>>>>>> block, understand what both sides do and produce the correct semantic merge — do not mechanically pick one side.// TODO: verify merge comment on the line above with a one-sentence explanation.git add <file>.git diff --name-only --diff-filter=U
Must return empty. If not, resolve the remaining files and repeat.
Print:
// TODO: verify merge locations that need human reviewgit commit or git rebase --continue)Render prose responses in bionic reading style by bolding the leading portion of each word, leaving code, paths, and commands untouched. Use when the user asks for bionic reading / bionic mode / bold-prefix formatting, or to toggle it off ("stop bionic", "normal formatting").
Analyze staged/unstaged changes and create a git commit that follows the project's detected conventions. Use when the user asks to commit, create a commit, or save changes to git. Push only if the user explicitly says "then push" in the same request.
Review and freshen all documentation and notes in the current project — discover and obey the project's own doc conventions, fix drift, flag quality gaps, and fill genuinely missing context. Use when the user asks to update docs, freshen documentation, audit AGENTS.md/rules, or clean up notes.
Iteratively review and simplify uncommitted changes until clean or stuck. Use when the user asks to polish, clean up, or iteratively improve uncommitted code changes.
Run the full wrap-up pipeline — polish, then docs-revise, then a single commit — in one deliberate pass. Use ONLY when the user explicitly asks to run polish, docs-revise, and commit together as one pipeline (e.g. "/ship", "polish docs-revise and commit", "wrap this up and ship it"). Do NOT auto-trigger for a plain "clean this up", "commit", "polish", or "update docs" request — those are the individual skills.
Writing voice profile for AI-drafted communication. Provides channel-specific style samples and anti-patterns under profiles/ — pick the file matching the output destination (PR comment, chat, commit message, formal email). Use when the user says "draft in my voice", "rewrite this like I'd say it", or another skill needs a consistent writing register. This skill does not know about its consumers.