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 saaspegasus/django-boilerplate --skill resolve-pegasus-conflictsgit clone --depth 1 https://github.com/saaspegasus/django-boilerplateWrote 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/saaspegasus/django-boilerplate/resolve-pegasus-conflicts)<a href="https://agentmods.dev/skills/saaspegasus/django-boilerplate/resolve-pegasus-conflicts"><img src="https://agentmods.dev/badge/skills/saaspegasus/django-boilerplate/resolve-pegasus-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/saaspegasus/django-boilerplate/resolve-pegasus-conflicts"><img src="https://agentmods.dev/badge/skills/saaspegasus/django-boilerplate/resolve-pegasus-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.00054 | $0.02932 |
| Opus 5 | $0.00027 | $0.01466 |
| Sonnet 5 | $0.00011 | $0.00586 |
| Haiku 4.5 | $0.00005 | $0.00293 |
Grade A, and why
resolve-pegasus-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 10d 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 — 176 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve Pegasus Conflicts
Instructions
This skill helps users resolve merge conflicts when upgrading their SaaS Pegasus codebase. Most users will invoke this skill when they have merge conflicts after merging their main branch into a Pegasus upgrade branch, but you can also help run the merge process for them.
When invoked
First, determine what the user needs help with by checking their current state:
- Check git status: Run
git statusto see if there's an active merge in progress - Ask the user: If unclear, ask whether they:
- Already ran
git mergeand need help resolving conflicts (most common) - Want you to run the merge process for them
- Need help understanding which conflicts to prioritize
- Already ran
If there's an active merge with conflicts
The user has already run git merge <main branch> and has conflicts to resolve. Help them resolve the conflicts using these strategies:
Database Migrations
Principle: When main/local and Pegasus disagree about a migration, main/local wins. Main's migration files typically reflect what the local DB (and prod) have already applied, so that history is the baseline you protect. When a Pegasus migration conflicts with or duplicates something main has already applied, you should drop Pegasus's version in favour of main's, then run ./manage.py makemigrations to re-express any genuine change as a clean forward diff (the change lives in the merged models, so makemigrations re-derives it).
- On a conflict: For conflicted migration files, accept the user's version from main with
git checkout --theirs <migration-file>, then run./manage.py makemigrationsafter all conflicts are resolved. - Watch for silent (conflict-free) migration changes — this is easy to miss: Pegasus regenerates its own auto-generated migrations and sometimes renames them (e.g.
0002_customuser_language...→0002_customuser_customer...). A rename is a delete-on-one-side + add-on-the-other, which git merges with no conflict markers — so it slips through silently and leaves you with a duplicate/competing migration the conflict step never flagged. After merging, always diff the migration dirs against main to catch this:
Treat anygit diff --name-status main HEAD -- '*/migrations/*.py'R(rename) the same as a conflict: restore main's file (git checkout main -- <file>), delete Pegasus's regenerated copy (git rm <file>), then./manage.py makemigrationsto regenerate the forward diff cleanly. Brand-new app migrations (allA, e.g. a freshly addedecommerceapp) are fine — keep those as-is. - djstripe migration references: If djstripe was upgraded, check if app migrations reference old djstripe migrations that no longer exist (see the "djstripe 2.10 upgrade" section below).
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.
- 10d ago First seen · 176 lines · 54 tokens per session scan A c5fec5ac862e
resolve-pegasus-conflicts is a skill published in the GitHub repository saaspegasus/django-boilerplate (168 stars, last pushed 3d ago), licensed MIT. It adds 54 tokens to every session and 2,932 once invoked, about $0.0003 per session on Opus 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.
Other skills, from other repositories
agent-merge-conflict-arbiter
Neutral arbiter for merge conflicts between two agents.
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
bisect
Bisect regressions or broken builds in the Chromium repository using deterministic binary search, checking out midpoint commits, syncing dependencies with gclient sync, compiling the target with autoninja, and querying the user for test results until the culprit commit is isolated.
mantis-critic
Assesses the production viability of findings, filtering out debug-only features and assertion traps. Use when findings have been validated and you need to confirm they are triggerable in production release builds (with assertions disabled). Don't use for writing reproduction scripts or patches.
hotpath_bump
Bump the hotpath version number across the workspace and related files. Updates crate versions in Cargo.toml files (exact patch version) and version references in the backend middleware, hotpathinit skill, and README (major.minor only). Use when the user wants to bump, bump the version, or release a new hotpath…
comet-github-issue-fix
A workflow for fixing a confirmed Comet-related GitHub issue or review blocker within an isolated scope. It covers matching the work to the relevant workflow, testing the change, checking runtime results, and preparing a careful handoff.