Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.
Install Resolve Conflicts
$ npx skills add haacked/dotfiles --skill resolve-conflicts -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install haacked/dotfiles resolve-conflicts --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/haacked/dotfiles.git skills-src && mkdir -p .claude/skills && cp -r skills-src/ai/skills/resolve-conflicts .claude/skills/resolve-conflicts && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "resolve-conflicts" agent skill from https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflicts into .claude/skills/resolve-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-conflicts", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflictsType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add haacked/dotfiles --skill resolve-conflicts -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install haacked/dotfiles resolve-conflicts --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/haacked/dotfiles.git skills-src && mkdir -p .agents/skills && cp -r skills-src/ai/skills/resolve-conflicts .agents/skills/resolve-conflicts && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "resolve-conflicts" agent skill from https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflicts into .agents/skills/resolve-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-conflicts", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add haacked/dotfiles --skill resolve-conflicts -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install haacked/dotfiles resolve-conflicts --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/haacked/dotfiles.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/ai/skills/resolve-conflicts .cursor/skills/resolve-conflicts && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "resolve-conflicts" agent skill from https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflicts into .cursor/skills/resolve-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-conflicts", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/haacked/dotfiles.git --path ai/skills/resolve-conflicts--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add haacked/dotfiles --skill resolve-conflicts -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install haacked/dotfiles resolve-conflicts --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/haacked/dotfiles.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/ai/skills/resolve-conflicts .gemini/skills/resolve-conflicts && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "resolve-conflicts" agent skill from https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflicts into .gemini/skills/resolve-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-conflicts", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install haacked/dotfiles resolve-conflictsInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add haacked/dotfiles --skill resolve-conflicts -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/haacked/dotfiles.git skills-src && mkdir -p .github/skills && cp -r skills-src/ai/skills/resolve-conflicts .github/skills/resolve-conflicts && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "resolve-conflicts" agent skill from https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflicts into .github/skills/resolve-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-conflicts", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add haacked/dotfiles --skill resolve-conflicts -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install haacked/dotfiles resolve-conflicts --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/haacked/dotfiles.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/ai/skills/resolve-conflicts .opencode/skills/resolve-conflicts && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "resolve-conflicts" agent skill from https://github.com/haacked/dotfiles/tree/main/ai/skills/resolve-conflicts into .opencode/skills/resolve-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-conflicts", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
resolve-conflicts- GitHub stars
- 134
- Token cost
- ~2.1k tokens
- SKILL.md length
- 1,040 words
- Files
- 7 (incl. scripts)
- Skills in repo
- 29
- Repo updated
- First seen
- Licence
- None found
At a glance
Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.
- Works in 3 steps: Detect Context → Resolve Conflicts → Continue
- Tasks that involve Git workflow
- SKILL.md covers Arguments (parsed from user… and Your Task
- Runs Shell scripts from its folder; calls git, npm and pnpm
What it does
Resolve Conflicts is an agent skill from haacked/dotfiles. Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.
Its SKILL.md is about 2.1k tokens, which your agent loads only when the skill is triggered. The skill folder holds 7 other files, including scripts (for example `scripts/categorize-conflicts.sh`, `scripts/conflict-status.sh` and `scripts/ensure-diff3-markers.sh`).
It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: My dotfiles and scripts I use on dev machines.
When your agent uses it
- Tasks that involve Git workflow
Example prompts
- “/resolve-conflicts”
Requirements
- Node.js
- A Bash shell
Workflow steps
3 steps, taken from the step headings in SKILL.md.
- Detect Context
- Resolve Conflicts
- Continue
What it can do on your machine
Read from SKILL.md and the folder at commit 23ffed9. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Ships 6 files in scripts/ (Shell), which the agent can run.
Shell commands in SKILL.md call:
gitnpmpnpmyarnbuncargopoetrybundlecomposer
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, npm, pnpm and yarn, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Resolve Conflicts loads about 2.1k tokens when it runs. Until then it costs about 40 tokens; SKILL.md has 1,040 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); the scripts in this folder are not scanned.
SKILL.md
Without a licence we can't republish the file, so here is its outline and opening line. It has 1,040 words (~2,105 tokens).
“Resolve conflicts from any git operation (rebase, merge, cherry-pick, revert) with intelligent handling of lock files, migrations, mergiraf-supported languages, and stacked PR duplicates.”
- name
- resolve-conflicts
- argument-hint
- --abort|--continue
- model
- opus
- metadata.execution-tier
- deep
Files
SKILL.md and 6 other files (scripts) in ai/skills/resolve-conflicts of haacked/dotfiles.
- SKILL.md
- scripts/categorize-conflicts.sh
- scripts/conflict-status.sh
- scripts/ensure-diff3-markers.sh
- scripts/test-categorize-conflicts.sh
- scripts/test-conflict-status.sh
- scripts/test-ensure-diff3-markers.sh
Open the folder on GitHubat commit 23ffed9
Compare with similar skills
Resolve Conflicts next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Resolve Conflicts this skillhaacked/dotfiles | 134 | — | ~2.1k | Automated safety check: Pass | None | |
| Finishing a Development Branchobra/superpowers | 296k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Code Design Rationale Investigatorcursor/plugins | 10k | 9 repos | ~2.6k | Automated safety check: Pass | None | |
| Contributor-First PR MergeHKUDS/OpenHarness | 16k | 1 repos | ~847 | Automated safety check: Pass | MIT | |
| Migrate Internal Package into GhostTryGhost/Ghost | 55k | — | ~3.8k | Automated safety check: Pass | MIT | |
| Create Pull Requestcline/cline | 70k | 1 repos | ~1.6k | Automated safety check: Pass | Apache-2.0 |
Similar skills
- Official
Code Design Rationale Investigator
cursor/plugins
Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.
Contributor-First PR Merge
HKUDS/OpenHarness
Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.
Migrate Internal Package into Ghost
TryGhost/Ghost
Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.
Create Pull Request
cline/cline
Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.
Git Merge Conflict Resolver
tailcallhq/forgecode
Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.
More from haacked/dotfiles
All 29 skills in this repoSupport
haacked/dotfiles
Support hero workflow — start a ticket investigation with auto-organized notes, find existing notes, or generate the weekly highlights log.
Analyze Permissions
haacked/dotfiles
Analyze accumulated permissions and suggest smart wildcard patterns.
Followup
haacked/dotfiles
Capture a follow-up item mid-session in seconds, list open items, close one, or run a review pass.
Handoff
haacked/dotfiles
Write or resume a handoff document so the next agent session can pick up the current work.
Note
haacked/dotfiles
Capture complex technical discoveries into structured, reusable notes.
Quarterly Planning
haacked/dotfiles
Draft quarterly goals for a PostHog team (defaults to Feature Flags), clustering open issues into themes and producing goals in PostHog's HOGS format.
Related
Works with
Categories
Questions about Resolve Conflicts
What does Resolve Conflicts do?
Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection. Resolve Conflicts is an agent skill from haacked/dotfiles. Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.
When should I use Resolve Conflicts?
Resolve Conflicts fits situations like: tasks that involve Git workflow.
How do I install Resolve Conflicts in Claude Code?
Run `npx skills add haacked/dotfiles --skill resolve-conflicts -a claude-code`. Or copy the skill folder (ai/skills/resolve-conflicts in haacked/dotfiles) into .claude/skills/resolve-conflicts in your project. Claude Code loads it when a task matches its description.
How do I install Resolve Conflicts in Codex?
Run `npx skills add haacked/dotfiles --skill resolve-conflicts -a codex`. Or copy the skill folder (ai/skills/resolve-conflicts in haacked/dotfiles) into .agents/skills/resolve-conflicts in your project. Codex loads it when a task matches its description.
Can I use Resolve Conflicts in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add haacked/dotfiles --skill resolve-conflicts -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/resolve-conflicts, .gemini/skills/resolve-conflicts, .github/skills/resolve-conflicts and .opencode/skills/resolve-conflicts in your project.
What does Resolve Conflicts need to run?
Going by SKILL.md and its folder, Resolve Conflicts needs a shell for the scripts in its folder and the command-line tools its instructions call (git, npm, pnpm, yarn, bun and cargo). Our summary lists: Node.js; A Bash shell.
Does Resolve Conflicts access the network?
SKILL.md contains no URLs. Its commands use git and npm, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Resolve Conflicts safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. The check reads SKILL.md only: the scripts in the folder are not scanned, so read them before running anything.
What licence does Resolve Conflicts use?
No licence was found for Resolve Conflicts or its repository. Without one, default copyright applies: ask the author before reusing or redistributing it.
How many tokens does Resolve Conflicts use?
About 2.1k tokens (SKILL.md is roughly 8.4k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Resolve Conflicts?
Skills that share tags, products or a category with Resolve Conflicts: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Resolve Conflicts?
haacked (a GitHub user) maintains it in haacked/dotfiles, which has 134 GitHub stars. The repository holds 29 skills in this directory. The repository was last updated on October 8, 2026.
Source: haacked/dotfiles on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.