New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Resolve Git Conflicts

by penpot in penpot/penpot

Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it.

MPL-2.0Auto-check passedDevelopment

Install Resolve Git Conflicts

skills CLI
$ npx skills add penpot/penpot --skill resolve-git-conflicts -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install penpot/penpot resolve-git-conflicts --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/penpot/penpot.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/resolve-git-conflicts .claude/skills/resolve-git-conflicts && rm -rf skills-src

Use ~/.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/

Facts

Skill name
resolve-git-conflicts
GitHub stars
61k
Token cost
~772 tokens
SKILL.md length
410 words
Files
1
Skills in repo
24
Repo updated
First seen
Licence
MPL-2.0

At a glance

Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it.

  • Works in 5 steps: Understand the problem (read-only) → Present the resolution plan → Execute → …
  • The repo has unresolved conflicts (rebase
  • SKILL.md covers When to use, Phase 1 — Understand the…, Phase 2 — Present the… and Phase 3 — Execute, plus 2 more sections
  • Calls git

What it does

Resolve Git Conflicts is an agent skill from penpot/penpot. Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.

Its SKILL.md is about 770 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Penpot: The open-source design platform for Product teams that need scalable collaboration. The licence is MPL-2.0.

When your agent uses it

  • The repo has unresolved conflicts (rebase
  • The user asks to resolve them

Example prompts

  • “/resolve-git-conflicts”

Workflow steps

5 steps, taken from the step headings in SKILL.md.

  1. Understand the problem (read-only)
  2. Present the resolution plan
  3. Execute
  4. Stage and verify
  5. Report

What it can do on your machine

Read from SKILL.md and the folder at commit cb1118f. 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:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, 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 Git Conflicts loads about 772 tokens when it runs. Until then it costs about 73 tokens; SKILL.md has 410 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~73
When it runs · the whole SKILL.md, loaded when a task matches
~772

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

The full file from penpot/penpot at commit cb1118f, republished under its MPL-2.0 licence (© penpot). 410 words, ~772 tokens.

Download SKILL.mdSave it as .claude/skills/resolve-git-conflicts/SKILL.md (or your agent's skills folder).
name
resolve-git-conflicts
description
Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.

Resolve Git Conflicts

Resolve conflicts in the local repository. The user handles finishing the rebase themselves — you must never run git rebase --continue, git rebase --skip, git merge --continue, or anything similar.

When to use

  • The repository has unresolved conflicts — during a rebase, merge, or cherry-pick — whether the user asks about them or not.
  • The user asks to resolve conflicts, in any phrasing: "fix the merge conflicts", "resolve these", "what's conflicting here?".

Phase 1 — Understand the problem (read-only)

  1. Run git status to detect the conflict state (rebase, merge, cherry-pick, etc.) and list conflicted files.
  2. For each conflicted (unmerged) file, understand the situation without modifying anything:
    • Read the file and identify the conflict markers (<<<<<<<, =======, >>>>>>>).
    • Inspect both sides — git show <ours>:<file> and git show <theirs>:<file> — plus git log/git show on the commits involved to understand intent.
    • Identify what each side changed and why, and how they should be combined.

Phase 2 — Present the resolution plan

  1. Present a clear plan to the user before touching any file. For each conflicted file, state:
    • What each side changed and why.
    • Your proposed resolution and the reasoning behind it.
    • How the two sides are combined (both additive → merge; both modify the same code → keep the semantically correct version, merging intent from both sides when clear from code and context).
  2. Ask the user only when genuinely unclear. Do not ask about anything you can determine yourself from the code, commit messages, or context. Only decisions that are not determinable and change the outcome (e.g. conflicting product decisions, which side to discard) warrant a question. Collect all such questions together in an "Open Questions" section at the end of the plan, so the user has full context to answer them properly.
  3. Wait for the user to accept the plan (and answer any open questions) before editing, staging, or otherwise modifying anything.
Show full SKILL.md (102 more words)Show less

Phase 3 — Execute

  1. Resolve each conflicted file by editing the file to the agreed merged content and removing all conflict markers.

Phase 4 — Stage and verify

  1. Stage every resolved file with git add <file>. Do not stage unrelated untracked files unless clearly part of the resolution.
  2. Verify no conflict markers remain (search for <<<<<<< / >>>>>>> in resolved files) and that git status shows no unmerged paths.

Phase 5 — Report

  1. Briefly report the conflict state, how each conflicted file was resolved (and any answers received to open questions), and stop — do not run git rebase --continue or any other continuation command.

© penpot, MPL-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/resolve-git-conflicts of penpot/penpot.

Open the folder on GitHubat commit cb1118f

Compare with similar skills

Resolve Git 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.

Resolve Git Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Resolve Git Conflicts this skillpenpot/penpot61k—~772Automated safety check: PassMPL-2.0
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost55k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • 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.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Code Design Rationale Investigator

    cursor/plugins

    Official

    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.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed

  • 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.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • 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.

    55k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

  • 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.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • 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.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from penpot/penpot

All 24 skills in this repo

  • Security And Hardening

    penpot/penpot

    Hardens code against vulnerabilities. An agent skill from penpot/penpot.

    61k GitHub starsUsed in 6 repos~4.7k tokens
    Auto-check: notes

  • Bat Cat

    penpot/penpot

    A cat clone with syntax highlighting, line numbers, and Git integration - a modern replacement for cat.

    61k GitHub starsUsed in 3 repos~1.1k tokens
    Auto-check passed

  • Create PR

    penpot/penpot

    PR flow — open a new PR for the current task branch (validates base branch, commits, issue and push state) or update an existing PR's title or description to match Penpot conventions.

    61k GitHub stars~1.4k tokensUpdated today
    Auto-check passed

  • Local CI

    penpot/penpot

    Run local CI-style checks with ./scripts/ci (lint, tests, format) per monorepo module.

    61k GitHub stars~822 tokensUpdated today
    Auto-check passed

  • Ste

    penpot/penpot

    Write or rewrite text in ASD-STE100 Simplified Technical English.

    61k GitHub stars~1.5k tokensUpdated today
    Auto-check passed

  • Code Review Criteria

    penpot/penpot

    Code review criteria — the five review axes, core principles, severity format, and verdict for reviewing code changes.

    61k GitHub stars~3.6k tokensUpdated today
    Auto-check passed

Works with

Categories

Questions about Resolve Git Conflicts

What does Resolve Git Conflicts do?

Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Resolve Git Conflicts is an agent skill from penpot/penpot. Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it.

When should I use Resolve Git Conflicts?

Resolve Git Conflicts fits situations like: the repo has unresolved conflicts (rebase; the user asks to resolve them.

How do I install Resolve Git Conflicts in Claude Code?

Run `npx skills add penpot/penpot --skill resolve-git-conflicts -a claude-code`. Or copy the skill folder (.agents/skills/resolve-git-conflicts in penpot/penpot) into .claude/skills/resolve-git-conflicts in your project. Claude Code loads it when a task matches its description.

How do I install Resolve Git Conflicts in Codex?

Run `npx skills add penpot/penpot --skill resolve-git-conflicts -a codex`. Or copy the skill folder (.agents/skills/resolve-git-conflicts in penpot/penpot) into .agents/skills/resolve-git-conflicts in your project. Codex loads it when a task matches its description.

Can I use Resolve Git 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 penpot/penpot --skill resolve-git-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-git-conflicts, .gemini/skills/resolve-git-conflicts, .github/skills/resolve-git-conflicts and .opencode/skills/resolve-git-conflicts in your project.

What does Resolve Git Conflicts need to run?

Going by SKILL.md and its folder, Resolve Git Conflicts needs the command-line tools its instructions call (git).

Does Resolve Git Conflicts access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Resolve Git 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 Git Conflicts use?

Resolve Git Conflicts is published under the MPL-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Resolve Git Conflicts use?

About 772 tokens (SKILL.md is roughly 3.1k 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 Git Conflicts?

Skills that share tags, products or a category with Resolve Git 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 Git Conflicts?

penpot (a GitHub organization) maintains it in penpot/penpot, which has 60,798 GitHub stars. The repository holds 24 skills in this directory. The repository was last updated on October 7, 2026.

Source: penpot/penpot on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.