New: 97,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

Official agent skill

Resolve Merge Conflicts

by github in github/gh-aw

Merge a base ref and safely regenerate compiled workflow lock-file conflicts.

OfficialMITAuto-check passedDevelopment

Install Resolve Merge Conflicts

skills CLI
$ npx skills add github/gh-aw --skill resolve-merge-conflicts -a claude-code

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

GitHub CLI
$ gh skill install github/gh-aw resolve-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/github/gh-aw.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.github/skills/resolve-merge-conflicts .claude/skills/resolve-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
resolve-merge-conflicts
GitHub stars
5.3k
Token cost
~747 tokens
SKILL.md length
373 words
Files
2
Skills in repo
52
Repo updated
First seen
Licence
MIT

At a glance

Merge a base ref and safely regenerate compiled workflow lock-file conflicts.

  • Works in 6 steps: Starts the merge with --no-commit, or… → Refuses to auto-resolve if any conflict… → Scans .github/workflows/*.md for… → …
  • Tasks that involve Git workflow
  • SKILL.md covers One-step path, Why the marker scan matters and Safety rules
  • Runs Shell scripts from its folder; calls make and git

What it does

Resolve Merge Conflicts is an agent skill from github/gh-aw, published by the product's own GitHub organization. Merge a base ref and safely regenerate compiled workflow lock-file conflicts.

Its SKILL.md is about 750 tokens, which your agent loads only when the skill is triggered. The skill folder holds 1 other file (for example `resolve.sh`).

It sits in Development, covering Git workflow. The repository describes itself as: GitHub Agentic Workflows. The licence is MIT.

When your agent uses it

  • Tasks that involve Git workflow

Example prompts

  • “/resolve-merge-conflicts”

Requirements

  • A Bash shell

Workflow steps

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

  1. Starts the merge with --no-commit, or resumes the current merge.
  2. Refuses to auto-resolve if any conflict is not a workflow .lock.yml.
  3. Scans .github/workflows/*.md for leftover conflict-marker lines
  4. Runs make recompile once so generated files come from the merged Markdown.
  5. Stages the regenerated conflicting lock files.
  6. Verifies that no unresolved paths or whitespace errors remain.

What it can do on your machine

Read from SKILL.md and the folder at commit eb63040. 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 script files (Shell), which the agent can run.

    Shell commands in SKILL.md call:

    • make
    • 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 Merge Conflicts loads about 747 tokens when it runs. Until then it costs about 25 tokens; SKILL.md has 373 words of instructions outside code blocks.

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

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 github/gh-aw at commit eb63040, republished under its MIT licence (© github). 373 words, ~747 tokens.

Download SKILL.mdSave it as .claude/skills/resolve-merge-conflicts/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
resolve-merge-conflicts
description
Merge a base ref and safely regenerate compiled workflow lock-file conflicts.
tools.bash
./.github/skills/resolve-merge-conflicts/resolve.sh *, git diff *, git status *

Resolve Merge Conflicts

Use this skill when merging origin/main into a branch, especially when the only conflicts are generated .github/workflows/*.lock.yml files.

One-step path

From the repository root, run:

bash
./.github/skills/resolve-merge-conflicts/resolve.sh origin/main

The command works both before a merge and after another command has stopped on conflicts. It:

  1. Starts the merge with --no-commit, or resumes the current merge.
  2. Refuses to auto-resolve if any conflict is not a workflow .lock.yml.
  3. Scans .github/workflows/*.md for leftover conflict-marker lines (<<<<<<<, |||||||, =======, >>>>>>>) and aborts before compiling if any are found — see "Why the marker scan matters" below.
  4. Runs make recompile once so generated files come from the merged Markdown.
  5. Stages the regenerated conflicting lock files.
  6. Verifies that no unresolved paths or whitespace errors remain.

The script does not fetch, commit, push, abort, or edit workflow Markdown. Refresh origin/main first only when credentials are available. After success, review the staged merge, run the repository's final validation gate, then commit and push.

Why the marker scan matters

A source .md conflict resolved manually (by a human or an agent) can leave a stray conflict-marker line behind — most often the rarely-noticed ||||||| base (original) diff3 marker — inside a workflow's YAML frontmatter. git diff --check only inspects lines touched by the current diff/staged hunks, so a marker already committed in otherwise-unchanged file content passes silently. The gh-aw compiler then parses the marker text as a literal YAML header option (e.g. invalid header option: "|||||| base (original)"), which fails compilation later — often in an unrelated scheduled recompilation run, far from the original merge, making the root cause hard to trace back.

Show full SKILL.md (114 more words)Show less

Run the standalone check any time you suspect a workflow .md file went through manual conflict resolution, even outside this script's merge flow:

bash
./.github/skills/resolve-merge-conflicts/resolve.sh --verify-markers

It exits non-zero and lists the offending file(s)/line(s) if any marker is found, and does not modify the working tree.

Safety rules

  • Never choose ours or theirs for compiled lock files; regenerate them.
  • Never manually remove conflict markers from .lock.yml files.
  • Never auto-resolve a source .md, Go, JavaScript, or other mixed conflict.
  • If the script refuses a mixed conflict, resolve source conflicts on their merits, stage them, and rerun the same command. It will regenerate the remaining lock conflicts.
  • Do not abort an existing merge unless the user explicitly requests it.

© github, 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 .github/skills/resolve-merge-conflicts of github/gh-aw.

  • SKILL.md
  • resolve.sh

Open the folder on GitHubat commit eb63040

Compare with similar skills

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

Resolve Merge Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Resolve Merge Conflicts this skillgithub/gh-aw5.3k—~747Automated safety check: PassMIT
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

  • Contextual Commit Messages

    yamadashy/repomix

    Writes Conventional Commits whose bodies carry action lines recording the intent, decisions and constraints behind a change, not only what changed.

    29k GitHub starsUsed in 1 repo~2.7k tokens
    DevelopmentAuto-check passed

More from github/gh-aw

All 52 skills in this repo

  • playwright-cli Browser Automation

    github/gh-aw

    Official

    Drives a real browser from the command line with playwright-cli to open pages, interact, mock requests, save state and work with Playwright tests.

    5.3k GitHub starsUsed in 23 repos~2.8k tokens
    Auto-check passed

  • Operational Value Designer

    github/gh-aw

    Official

    Designs and verifies a deterministic grader that measures whether a GitHub Agentic Workflow run reached its real-world or repository outcome.

    5.3k GitHub stars~6.8k tokensUpdated today
    Auto-check passed

  • Copilot Canvas Extension Author

    github/gh-aw

    Official

    Scaffolds, edits, reloads and debugs a canvas extension that the GitHub Copilot CLI can open in its side panel.

    5.3k GitHub stars~3.7k tokensUpdated today
    Auto-check passed

  • GitHub Copilot PR Finisher

    github/gh-aw

    Official

    Drives an open pull request to merge-ready from inside a GitHub Copilot cloud agent, resolving review threads and local checks concurrently, without merging or retriggering CI.

    5.3k GitHub stars~3.8k tokensUpdated today
    Auto-check: warnings

  • gh-aw Firewall Release Integrator

    github/gh-aw

    Official

    Bumps gh-aw's pinned gh-aw-firewall version, rebuilds generated artifacts, and flags upstream spec or schema changes that need follow-up work.

    5.3k GitHub stars~899 tokensUpdated today
    Auto-check passed

  • gh-aw Console Rendering Tags

    github/gh-aw

    Official

    Guide to the console struct tag system in gh-aw: headers, titles, number and cost formats, omitempty, and how structs, slices and maps render in the terminal.

    5.3k GitHub stars~736 tokensUpdated today
    Auto-check passed

Categories

Questions about Resolve Merge Conflicts

What does Resolve Merge Conflicts do?

Merge a base ref and safely regenerate compiled workflow lock-file conflicts. Resolve Merge Conflicts is an agent skill from github/gh-aw, published by the product's own GitHub organization. Merge a base ref and safely regenerate compiled workflow lock-file conflicts.

When should I use Resolve Merge Conflicts?

Resolve Merge Conflicts fits situations like: tasks that involve Git workflow.

How do I install Resolve Merge Conflicts in Claude Code?

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

How do I install Resolve Merge Conflicts in Codex?

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

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

What does Resolve Merge Conflicts need to run?

Going by SKILL.md and its folder, Resolve Merge Conflicts needs a shell for the scripts in its folder and the command-line tools its instructions call (make and git). Our summary lists: A Bash shell.

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

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

About 747 tokens (SKILL.md is roughly 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 Resolve Merge Conflicts?

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

github (a GitHub organization, an official publisher) maintains it in github/gh-aw, which has 5,350 GitHub stars. The repository holds 52 skills in this directory. The repository was last updated on October 7, 2026.

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