GitHub Agentic Workflows is a GitHub CLI extension that lets developers define AI-assisted repository automation in Markdown and run it through GitHub Actions. It is intended for tasks requiring interpretation or reasoning, such as issue triage, pull-request review, CI investigation, documentation maintenance, and dependency analysis. The catalogue entries provide skills and agents for working with these workflows.
Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
npx skills add github/gh-aw --skill resolve-merge-conflictsgit clone --depth 1 https://github.com/github/gh-awWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/skills/github/gh-aw/resolve-merge-conflicts)<a href="https://agentmods.dev/skills/github/gh-aw/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/github/gh-aw/resolve-merge-conflicts/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/github/gh-aw/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/github/gh-aw/resolve-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector pass
What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00019 | $0.00687 |
| Opus 5.5 | $0.00008 | $0.00275 |
| Sonnet 5.5 | $0.00004 | $0.00137 |
| Haiku 4.5 | $0.00002 | $0.00069 |
Grade A, and why
resolve-merge-conflicts scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2mo ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
How it starts
The opening of the file, as written. The whole thing — 74 lines — stays where its author put it; the contents beside it link to each section on GitHub.
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:
./.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:
- Starts the merge with
--no-commit, or resumes the current merge. - Refuses to auto-resolve if any conflict is not a workflow
.lock.yml. - Scans
.github/workflows/*.mdfor leftover conflict-marker lines (<<<<<<<,|||||||,=======,>>>>>>>) and aborts before compiling if any are found — see "Why the marker scan matters" below. - Runs
make recompileonce so generated files come from the merged Markdown. - Stages the regenerated conflicting lock files.
- 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.
Run the standalone check any time you suspect a workflow .md file went
through manual conflict resolution, even outside this script's merge flow:
What ships with it
1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 2mo ago Changed · +26 lines 3f17ae35499e
- 2mo ago First seen · 48 lines · 19 tokens per session scan A c0b3a31133b8
resolve-merge-conflicts is a skill published in the GitHub repository github/gh-aw (5,579 stars, last pushed yesterday), licensed MIT. It adds 19 tokens to every session and 687 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.
resolve-merge-conflicts compared with skills from other repositories
| Mod | Type | Stars | Last push | Licence | Scan | Tokens | Works with |
|---|---|---|---|---|---|---|---|
| resolve-merge-conflictsgithub/gh-aw | Skill | 5.6k | yesterday | MIT | A | 19 | Claude Code, Codex |
| watch-prjustincampbell/gh-watch | Skill | 4 | 7d ago | MIT | A | 48 | Claude Code |
| watch-tagjustincampbell/gh-watch | Skill | 4 | 7d ago | MIT | A | 62 | Claude Code |
| watch-branchjustincampbell/gh-watch | Skill | 4 | 7d ago | MIT | A | 45 | Claude Code |
| c-githubdaxaur/openpaw | Skill | 177 | 5mo ago | MIT | A | 48 | Claude Code, Codex |
| ci-cdLuuOW/meridian-mcp | Skill | 0 | 24d ago | MIT | C | 48 | Claude Code, Codex |
| githubAIOSAI/AIPass | Skill | 312 | 4d ago | MIT | A | 23 | Claude Code |