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

Resolving Merge Conflicts

by stevesolun in stevesolun/ctx

Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides.

MITAuto-check passedDevelopment

Install Resolving Merge Conflicts

skills CLI
$ npx skills add stevesolun/ctx --skill resolving-merge-conflicts -a claude-code

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

GitHub CLI
$ gh skill install stevesolun/ctx resolving-merge-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/stevesolun/ctx.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/resolving-merge-conflicts .claude/skills/resolving-merge-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
resolving-merge-conflicts
GitHub stars
588
Token cost
~330 tokens
SKILL.md length
163 words
Files
2
Skills in repo
26
Repo updated
First seen
Licence
MIT

At a glance

Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides.

  • Works in 5 steps: Inspect the current Git state, the… → Reconstruct each side's intent from the… → Resolve each hunk by preserving… → …
  • Conflict markers
  • Instructions only: no scripts, shell commands, URLs or credentials in SKILL.md
  • An interrupted merge/rebase need investigation and resolution

What it does

Resolving Merge Conflicts is an agent skill from stevesolun/ctx. Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.

Its SKILL.md is about 330 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. It works with Git. The repository describes itself as: CTX Fit finds the cheapest AI coding setup that reliably works on your repository, then applies the winner as a reviewable change. The licence is MIT.

When your agent uses it

  • Conflict markers
  • An interrupted merge/rebase need investigation and resolution

Example prompts

  • “/resolving-merge-conflicts”

Workflow steps

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

  1. Inspect the current Git state, the operation in progress, its goal, and every
  2. Reconstruct each side's intent from the code, nearby tests, history, commit
  3. Resolve each hunk by preserving compatible intent. Where intents conflict,
  4. Run focused checks for the affected surface, then broader checks when risk or
  5. Unless the user requested advice or review only, stage resolved files and

What it can do on your machine

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

Resolving Merge Conflicts loads about 330 tokens when it runs. Until then it costs about 55 tokens; SKILL.md has 163 words of instructions outside code blocks.

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

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 stevesolun/ctx at commit 11b582a, republished under its MIT licence (© stevesolun). 163 words, ~330 tokens.

Download SKILL.mdSave it as .claude/skills/resolving-merge-conflicts/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
resolving-merge-conflicts
description
Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.

Resolve Merge Conflicts

  1. Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
  2. Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
  3. Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
  4. Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
  5. Unless the user requested advice or review only, stage resolved files and continue the current merge or rebase when it is safe to do so. Report what was resolved, what was verified, and any remaining uncertainty.

Pause rather than guess when neither intent can be preserved safely. Aborting or restarting can be the correct recovery when the base is wrong, the operation is contaminated, or the user prefers a clean retry; explain the trade-off before taking that destructive step.

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

Files

SKILL.md and 1 other file in .agents/skills/resolving-merge-conflicts of stevesolun/ctx.

  • SKILL.md
  • agents/openai.yaml

Open the folder on GitHubat commit 11b582a

Compare with similar skills

Resolving Merge 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.

Resolving Merge Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Resolving Merge Conflicts this skillstevesolun/ctx588—~330Automated 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 stevesolun/ctx

All 26 skills in this repo

  • Diagnosing Bugs

    stevesolun/ctx

    Diagnose hard bugs and performance regressions with reproducible evidence, focused hypotheses, and proportional instrumentation.

    588 GitHub stars~596 tokensUpdated 5 days ago
    Auto-check passed

  • Repo Stats Autoupdate

    stevesolun/ctx

    Keeps README badge + inline counts in sync with the real number of skills, agents, graph nodes/edges, communities, converted pipelines, and test inventory.

    588 GitHub stars~724 tokensUpdated 5 days ago
    Auto-check passed

  • Code Review

    stevesolun/ctx

    Review a Git diff against repository standards and its originating requirements.

    588 GitHub stars~466 tokensUpdated 5 days ago
    Auto-check passed

  • No Mistakes

    stevesolun/ctx

    Validate committed feature-branch changes through the no-mistakes pipeline: intent, rebase, review, test, docs, lint, push, PR, and CI.

    588 GitHub stars~458 tokensUpdated 5 days ago
    Auto-check passed

  • Skill Router

    stevesolun/ctx

    Repo-aware recommendation manager for ctx. An agent skill from stevesolun/ctx.

    588 GitHub stars~2.4k tokensUpdated 5 days ago
    Auto-check passed

  • Codebase Design

    stevesolun/ctx

    Design or improve module interfaces using deep-module heuristics.

    588 GitHub stars~662 tokensUpdated 5 days ago
    Auto-check passed

Works with

Categories

Questions about Resolving Merge Conflicts

What does Resolving Merge Conflicts do?

Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Resolving Merge Conflicts is an agent skill from stevesolun/ctx. Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides.

When should I use Resolving Merge Conflicts?

Resolving Merge Conflicts fits situations like: conflict markers; an interrupted merge/rebase need investigation and resolution.

How do I install Resolving Merge Conflicts in Claude Code?

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

How do I install Resolving Merge Conflicts in Codex?

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

Can I use Resolving Merge 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 stevesolun/ctx --skill resolving-merge-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/resolving-merge-conflicts, .gemini/skills/resolving-merge-conflicts, .github/skills/resolving-merge-conflicts and .opencode/skills/resolving-merge-conflicts in your project.

What does Resolving Merge Conflicts need to run?

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

Does Resolving Merge Conflicts 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 Resolving Merge 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 Resolving Merge Conflicts use?

Resolving Merge Conflicts 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 Resolving Merge Conflicts use?

About 330 tokens (SKILL.md is roughly 1.3k 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 Resolving Merge Conflicts?

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

stevesolun (a GitHub user) maintains it in stevesolun/ctx, which has 588 GitHub stars. The repository holds 26 skills in this directory. The repository was last updated on October 4, 2026.

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