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 Merge Conflict

by jackfranklin in jackfranklin/dotfiles

A skill your agent uses when you need to resolve an in-progress git merge/rebase conflict.

MITAuto-check passedDevelopment

Install Resolve Merge Conflict

skills CLI
$ npx skills add jackfranklin/dotfiles --skill resolve-merge-conflict -a claude-code

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

GitHub CLI
$ gh skill install jackfranklin/dotfiles resolve-merge-conflict --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/jackfranklin/dotfiles.git skills-src && mkdir -p .claude/skills && cp -r skills-src/claude/skills/resolve-merge-conflict .claude/skills/resolve-merge-conflict && 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-merge-conflict
GitHub stars
255
Used in
23 other repos
Token cost
~427 tokens
SKILL.md length
236 words
Files
1
Skills in repo
19
Repo updated
First seen
Licence
MIT

At a glance

A skill your agent uses when you need to resolve an in-progress git merge/rebase conflict.

  • Works in 6 steps: Confirm authority and see the current… → Find the primary sources for each… → Resolve each hunk. Preserve both intents… → …
  • You need to resolve an in-progress git merge/rebase conflict
  • Instructions only: no scripts, shell commands, URLs or credentials in SKILL.md
  • Tasks that involve Git workflow

What it does

Resolve Merge Conflict is an agent skill from jackfranklin/dotfiles. Use when you need to resolve an in-progress git merge/rebase conflict.

Its SKILL.md is about 430 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: My dotfiles for my dev environment, compromising of tmux, vim, zsh and git. The licence is MIT.

When your agent uses it

  • You need to resolve an in-progress git merge/rebase conflict
  • Tasks that involve Git workflow

Example prompts

  • “/resolve-merge-conflict”

Workflow steps

6 steps, taken from the first numbered list in SKILL.md.

  1. Confirm authority and see the current state. Check the merge/rebase state, Git history, and conflicting files. If the user explicitly…
  2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit…
  3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the…
  4. Verify conflict markers. Before staging any resolved file, explicitly search it to ensure all conflict markers (<<<<<<<, =======, >>>>>>>)…
  5. Discover the project's automated checks. Run only checks that do not modify tracked files. If a check may format or otherwise write files…
  6. Finish only the intended merge/rebase. Stage only the resolved conflict files. If unrelated staged or modified files are present, stop and…

What it can do on your machine

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

    No scripts in the folder and no shell commands in SKILL.md.

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

  • Network

    No URLs in SKILL.md.

    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 Merge Conflict loads about 427 tokens when it runs. Until then it costs about 23 tokens; SKILL.md has 236 words of instructions outside code blocks.

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

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 jackfranklin/dotfiles at commit 48208f5, republished under its MIT licence (© jackfranklin). 236 words, ~427 tokens.

Download SKILL.mdSave it as .claude/skills/resolve-merge-conflict/SKILL.md (or your agent's skills folder).
name
resolve-merge-conflict
description
Use when you need to resolve an in-progress git merge/rebase conflict.

  1. Confirm authority and see the current state. Check the merge/rebase state, Git history, and conflicting files. If the user explicitly asked to resolve the conflicts, that authorizes resolution. If the conflict was only discovered while doing another task, inspect it without editing and ask for confirmation before resolving it.

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

  3. 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. Never --abort a user's merge/rebase without explicit authorization. If you are unsure of the correct resolution, stop and ask the user for clarification.

  4. Verify conflict markers. Before staging any resolved file, explicitly search it to ensure all conflict markers (<<<<<<<, =======, >>>>>>>) have been removed.

  5. Discover the project's automated checks. Run only checks that do not modify tracked files. If a check may format or otherwise write files, or a failure requires changes beyond the resolved conflict files, ask the user before running it or making those changes.

  6. Finish only the intended merge/rebase. Stage only the resolved conflict files. If unrelated staged or modified files are present, stop and ask which files to include. Commit the resolution, or continue the rebase process until all commits are rebased.

© jackfranklin, MIT. 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 claude/skills/resolve-merge-conflict of jackfranklin/dotfiles.

Open the folder on GitHubat commit 48208f5

Used in 24 other repositories

We found 32 copies of this SKILL.md (exact, near-identical or edited) in other folders, from 23 other GitHub owners. This page covers the copy in jackfranklin/dotfiles, which our catalogue first saw on October 7, 2026.

Compare with similar skills

Resolve Merge Conflict 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 Merge Conflict compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Resolve Merge Conflict this skilljackfranklin/dotfiles25523 repos~427Automated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 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/Ghost56k—~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.

    297k 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.

    56k 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 jackfranklin/dotfiles

All 19 skills in this repo

  • GitHub Code Review

    jackfranklin/dotfiles

    Perform a thorough, read-only review of one GitHub pull request.

    255 GitHub stars~1.8k tokensUpdated today
    Auto-check passed

  • Adr

    jackfranklin/dotfiles

    Capture an Architecture Decision Record (ADR) for a significant decision made in the current project.

    255 GitHub stars~962 tokensUpdated today
    Auto-check passed

  • Jack References

    jackfranklin/dotfiles

    Manage Jack's personal technical reference library at ~/git/references.

    255 GitHub stars~1.2k tokensUpdated today
    Auto-check passed

  • Later

    jackfranklin/dotfiles

    Log items to come back to later — bugs found mid-task, feature ideas, project feedback — as GitHub Issues.

    255 GitHub stars~767 tokensUpdated today
    Auto-check passed

  • New Deno App

    jackfranklin/dotfiles

    Scaffold a new Deno 2 + Hono + Deno KV + Eta + HTMX app with password auth and PWA support.

    255 GitHub stars~3.6k tokensUpdated today
    Auto-check: notes

  • Writing Great Skills

    jackfranklin/dotfiles

    Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable.

    255 GitHub starsUsed in 15 repos~2.2k tokens
    Auto-check passed

Works with

Categories

Questions about Resolve Merge Conflict

What does Resolve Merge Conflict do?

A skill your agent uses when you need to resolve an in-progress git merge/rebase conflict. Resolve Merge Conflict is an agent skill from jackfranklin/dotfiles. Use when you need to resolve an in-progress git merge/rebase conflict.

When should I use Resolve Merge Conflict?

Resolve Merge Conflict fits situations like: you need to resolve an in-progress git merge/rebase conflict; tasks that involve Git workflow.

How do I install Resolve Merge Conflict in Claude Code?

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

How do I install Resolve Merge Conflict in Codex?

Run `npx skills add jackfranklin/dotfiles --skill resolve-merge-conflict -a codex`. Or copy the skill folder (claude/skills/resolve-merge-conflict in jackfranklin/dotfiles) into .agents/skills/resolve-merge-conflict in your project. Codex loads it when a task matches its description.

Can I use Resolve Merge Conflict 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 jackfranklin/dotfiles --skill resolve-merge-conflict -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-merge-conflict, .gemini/skills/resolve-merge-conflict, .github/skills/resolve-merge-conflict and .opencode/skills/resolve-merge-conflict in your project.

What does Resolve Merge Conflict need to run?

SKILL.md names no scripts, command-line tools or credentials: Resolve Merge Conflict is instructions for the agent only.

Does Resolve Merge Conflict access the network?

SKILL.md contains no URLs. Any network use would come from the scripts or tools the agent runs. This is read from the text; nothing was executed.

Is Resolve Merge Conflict 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 Merge Conflict use?

Resolve Merge Conflict is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Resolve Merge Conflict use?

About 427 tokens (SKILL.md is roughly 1.7k 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 Merge Conflict?

Skills that share tags, products or a category with Resolve Merge Conflict: Finishing a Development Branch (obra/superpowers, 297k 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, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Resolve Merge Conflict?

jackfranklin (a GitHub user) maintains it in jackfranklin/dotfiles, which has 255 GitHub stars. The repository holds 19 skills in this directory. The repository was last updated on October 8, 2026.

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