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 merge conflicts in an open pull request for this repository.
Install Resolve PR Conflicts
$ npx skills add jtenniswood/espframe --skill resolve-pr-conflicts -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install jtenniswood/espframe resolve-pr-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/jtenniswood/espframe.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/resolve-pr-conflicts .claude/skills/resolve-pr-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-pr-conflicts" agent skill from https://github.com/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-conflicts into .claude/skills/resolve-pr-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-pr-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/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-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 jtenniswood/espframe --skill resolve-pr-conflicts -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install jtenniswood/espframe resolve-pr-conflicts --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jtenniswood/espframe.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.agents/skills/resolve-pr-conflicts .agents/skills/resolve-pr-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-pr-conflicts" agent skill from https://github.com/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-conflicts into .agents/skills/resolve-pr-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-pr-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 jtenniswood/espframe --skill resolve-pr-conflicts -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install jtenniswood/espframe resolve-pr-conflicts --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jtenniswood/espframe.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.agents/skills/resolve-pr-conflicts .cursor/skills/resolve-pr-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-pr-conflicts" agent skill from https://github.com/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-conflicts into .cursor/skills/resolve-pr-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-pr-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/jtenniswood/espframe.git --path .agents/skills/resolve-pr-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 jtenniswood/espframe --skill resolve-pr-conflicts -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install jtenniswood/espframe resolve-pr-conflicts --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jtenniswood/espframe.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.agents/skills/resolve-pr-conflicts .gemini/skills/resolve-pr-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-pr-conflicts" agent skill from https://github.com/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-conflicts into .gemini/skills/resolve-pr-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-pr-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 jtenniswood/espframe resolve-pr-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 jtenniswood/espframe --skill resolve-pr-conflicts -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/jtenniswood/espframe.git skills-src && mkdir -p .github/skills && cp -r skills-src/.agents/skills/resolve-pr-conflicts .github/skills/resolve-pr-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-pr-conflicts" agent skill from https://github.com/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-conflicts into .github/skills/resolve-pr-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-pr-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 jtenniswood/espframe --skill resolve-pr-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 jtenniswood/espframe resolve-pr-conflicts --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jtenniswood/espframe.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.agents/skills/resolve-pr-conflicts .opencode/skills/resolve-pr-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-pr-conflicts" agent skill from https://github.com/jtenniswood/espframe/tree/main/.agents/skills/resolve-pr-conflicts into .opencode/skills/resolve-pr-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolve-pr-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-pr-conflicts- GitHub stars
- 208
- Token cost
- ~1.4k tokens
- SKILL.md length
- 531 words
- Files
- 2
- Skills in repo
- 5
- Repo updated
- First seen
- Licence
- Custom licence
At a glance
Resolve merge conflicts in an open pull request for this repository.
- Works in 6 steps: Identify the PR → Protect Local Work → Bring in the Base Branch → …
- The user says /resolve-pr-conflicts
- SKILL.md covers Overview, Workflow and Output Format
- Calls git, npm and gh
What it does
Resolve PR Conflicts is an agent skill from jtenniswood/espframe. Resolve merge conflicts in an open pull request for this repository. Use when the user says "/resolve-pr-conflicts", asks to fix PR conflicts, says a pull request cannot merge because it is behind main, asks to update a PR branch from main, or asks to make a conflicted PR testable again.
Its SKILL.md is about 1.4k tokens, which your agent loads only when the skill is triggered. The skill folder holds 2 other files (for example `agents/openai.yaml`).
It sits in Development, covering Git workflow and Pull requests. The repository describes itself as: Esphome based Immich digital photo frame.
When your agent uses it
- The user says /resolve-pr-conflicts
- Asks to fix PR conflicts
- Says a pull request cannot merge because it is behind main
- Asks to update a PR branch from main
Example prompts
- “/resolve-pr-conflicts”
- “/resolve-pr-conflicts”
Workflow steps
6 steps, taken from the step headings in SKILL.md.
- Identify the PR
- Protect Local Work
- Bring in the Base Branch
- Resolve Conflicts Deliberately
- Run Focused Checks
- Commit and Push
What it can do on your machine
Read from SKILL.md and the folder at commit 12db1d5. 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
Shell commands in SKILL.md call:
gitnpmgh
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 and gh, 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 PR Conflicts loads about 1.4k tokens when it runs. Until then it costs about 77 tokens; SKILL.md has 531 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); files beside SKILL.md are not scanned.
SKILL.md
Its licence (Custom licence) doesn't allow us to republish the file, so here is its outline and opening line. It has 531 words (~1,398 tokens).
“Resolve pull request merge conflicts without merging into main. Work on the PR branch or a maintainer-owned conflict-fix branch, commit the resolved files, push the branch, and leave the PR open for user testing.”
- name
- resolve-pr-conflicts
Files
SKILL.md and 1 other file in .agents/skills/resolve-pr-conflicts of jtenniswood/espframe.
- SKILL.md
- agents/openai.yaml
Open the folder on GitHubat commit 12db1d5
Used in 1 other repository
We found 1 copy of this SKILL.md (exact, near-identical or edited) in other folders. This page covers the copy in jtenniswood/espframe, which our catalogue first saw on October 7, 2026.
Compare with similar skills
Resolve PR 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 PR Conflicts this skilljtenniswood/espframe | 208 | — | ~1.4k | Automated safety check: Pass | Custom licence | |
| Finishing a Development Branchobra/superpowers | 297k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Contributor-First PR MergeHKUDS/OpenHarness | 16k | 1 repos | ~847 | Automated safety check: Pass | MIT | |
| Create Pull Requestcline/cline | 70k | 1 repos | ~1.6k | Automated safety check: Pass | Apache-2.0 | |
| Git Branch Namingmakeplane/plane | 61k | — | ~594 | Automated safety check: Pass | AGPL-3.0 | |
| Create Pull Request with Work Item IDmakeplane/plane | 61k | — | ~824 | Automated safety check: Pass | AGPL-3.0 |
Similar skills
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.
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 Branch Naming
makeplane/plane
Names a new Git branch with a type prefix, the lowercased work item ID and a short kebab-case description, so the ID can be extracted later from the branch name.
Create Pull Request with Work Item ID
makeplane/plane
Opens a pull request for the current branch using the repo's template, a work item ID in the title and a description filled in from the actual diff.
Git Workflow and Versioning
addyosmani/agent-skills
Sets git habits for every change: short-lived branches, atomic commits with descriptive messages, clean pull requests, plus versioning, tagging and changelogs for releases.
More from jtenniswood/espframe
Flash Displays
jtenniswood/espframe
Flash the Espframe 10-inch display firmware from this repository using ESPHome.
Release
jtenniswood/espframe
Create and publish a new GitHub release for this repository, then wait for the related GitHub Actions firmware release build to complete successfully.
Updates
jtenniswood/espframe
Summarize user-facing changes made to this project over the last 7 days.
API Review
jtenniswood/espframe
Review and reimagine this repository's use of the Immich API.
Related
Categories
Questions about Resolve PR Conflicts
What does Resolve PR Conflicts do?
Resolve merge conflicts in an open pull request for this repository. Resolve PR Conflicts is an agent skill from jtenniswood/espframe. Resolve merge conflicts in an open pull request for this repository.
When should I use Resolve PR Conflicts?
Resolve PR Conflicts fits situations like: the user says /resolve-pr-conflicts; asks to fix PR conflicts; says a pull request cannot merge because it is behind main; asks to update a PR branch from main.
How do I install Resolve PR Conflicts in Claude Code?
Run `npx skills add jtenniswood/espframe --skill resolve-pr-conflicts -a claude-code`. Or copy the skill folder (.agents/skills/resolve-pr-conflicts in jtenniswood/espframe) into .claude/skills/resolve-pr-conflicts in your project. Claude Code loads it when a task matches its description.
How do I install Resolve PR Conflicts in Codex?
Run `npx skills add jtenniswood/espframe --skill resolve-pr-conflicts -a codex`. Or copy the skill folder (.agents/skills/resolve-pr-conflicts in jtenniswood/espframe) into .agents/skills/resolve-pr-conflicts in your project. Codex loads it when a task matches its description.
Can I use Resolve PR 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 jtenniswood/espframe --skill resolve-pr-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-pr-conflicts, .gemini/skills/resolve-pr-conflicts, .github/skills/resolve-pr-conflicts and .opencode/skills/resolve-pr-conflicts in your project.
What does Resolve PR Conflicts need to run?
Going by SKILL.md and its folder, Resolve PR Conflicts needs the command-line tools its instructions call (git, npm and gh).
Does Resolve PR Conflicts access the network?
SKILL.md contains no URLs. Its commands use git, npm and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Resolve PR 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. Review the folder before installing.
What licence does Resolve PR Conflicts use?
Resolve PR Conflicts has a licence file (the repository's licence) that doesn't match a standard licence. Read it on GitHub before reusing the skill.
How many tokens does Resolve PR Conflicts use?
About 1.4k tokens (SKILL.md is roughly 5.6k 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 PR Conflicts?
Skills that share tags, products or a category with Resolve PR Conflicts: Finishing a Development Branch (obra/superpowers, 297k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars), Create Pull Request (cline/cline, 70k stars) and Git Branch Naming (makeplane/plane, 61k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Resolve PR Conflicts?
jtenniswood (a GitHub user) maintains it in jtenniswood/espframe, which has 208 GitHub stars. The repository holds 5 skills in this directory. The repository was last updated on October 10, 2026.
Source: jtenniswood/espframe on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.