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

Official agent skill

Autoresolving PR Conflicts

by PostHog in PostHog/posthog

Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source…

OfficialCustom licenceAuto-check passedDevelopment

Install Autoresolving PR Conflicts

skills CLI
$ npx skills add PostHog/posthog --skill autoresolving-pr-conflicts -a claude-code

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

GitHub CLI
$ gh skill install PostHog/posthog autoresolving-pr-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/PostHog/posthog.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/autoresolving-pr-conflicts .claude/skills/autoresolving-pr-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
autoresolving-pr-conflicts
GitHub stars
40k
Token cost
~4.2k tokens
SKILL.md length
2,333 words
Files
4 (incl. scripts, references)
Skills in repo
252
Repo updated
First seen
Licence
Custom licence

At a glance

Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source…

  • Works in 5 steps: Snapshot this skill's scripts/ directory… → If git rev-parse --is-shallow-repository… → List candidates: gh pr list --state open… → …
  • Running as the scheduled conflict autoresolver
  • SKILL.md covers Non-negotiable rules, Untrusted input, State: the marker comment and The sweep, plus 3 more sections
  • Runs Shell scripts from its folder; calls git, gh and jq

What it does

Autoresolving PR Conflicts is an agent skill from PostHog/posthog, published by the product's own GitHub organization. Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source conflicts with judgment), land one merge commit on the PR head, and flag everything else for a human. Use when running as the scheduled conflict autoresolver, when asked to sweep or auto-resolve merge conflicts against master, or when asked to bring a conflicting PR up to date without rewriting its history. Trigger terms…

Its SKILL.md is about 4.2k tokens, which your agent loads only when the skill is triggered. The skill folder holds 5 other files, including scripts and reference files (for example `references/routine-setup.md`, `scripts/autoresolve-marker.sh` and `scripts/regen-artifacts.sh`).

It sits in Development, covering Git workflow. It works with PostHog and Git. The repository describes itself as: :hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error…

When your agent uses it

  • Running as the scheduled conflict autoresolver
  • Auto-resolve merge conflicts against master
  • Asked to bring a conflicting PR up to date without rewriting its history
  • Terms: conflict sweep

Example prompts

  • “/autoresolving-pr-conflicts”

Requirements

  • A Bash shell

Workflow steps

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

  1. Snapshot this skill's scripts/ directory to a scratch path outside the repo; every helper invocation below uses that snapshot.
  2. If git rev-parse --is-shallow-repository says true, run git fetch --unshallow (or deepen until step 5's merge-tree stops failing with…
  3. List candidates: gh pr list --state open -L 1000 --json number,isDraft,headRefName,headRefOid,headRepository,headRepositoryOwner,baseRefNam…
  4. Bulk-fetch the surviving candidates' heads in one git call: git fetch origin +refs/pull//head:refs/remotes/pull/ .... Git protocol traffic…
  5. Evaluate candidates newest-first, lazily, stopping once 10 have entered resolution; per candidate, cheapest check first

What it can do on your machine

Read from SKILL.md and the folder at commit 10f9ad7. 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 2 files in scripts/ (Shell), which the agent can run.

    Shell commands in SKILL.md call:

    • git
    • gh
    • jq
    • pnpm

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

  • Network

    No URLs in SKILL.md. Its commands use git, gh and pnpm, 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

Autoresolving PR Conflicts loads about 4.2k tokens when it runs, and up to ~6.2k if it reads all its reference files. Until then it costs about 178 tokens; SKILL.md has 2,333 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~178
When it runs · the whole SKILL.md, loaded when a task matches
~4.2k
With references · SKILL.md plus every file in references/, read only if the agent opens them
~6.2k

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); the scripts in this folder are not scanned.

SKILL.md

Its licence (Custom licence) doesn't allow us to republish the file, so here is its outline and opening line. It has 2,333 words (~4,233 tokens).

“You are acting as the conflict autoresolver for this repository. One run is one sweep: find open PRs that conflict with master, resolve the ones that can be resolved safely, push the result to each PR's existing head branch, and…”

— opening of SKILL.md by PostHog, Custom licence
name
autoresolving-pr-conflicts

Read the full SKILL.md on GitHub

Files

SKILL.md and 3 other files (scripts, references) in .agents/skills/autoresolving-pr-conflicts of PostHog/posthog.

  • SKILL.md
  • references/routine-setup.md
  • scripts/autoresolve-marker.sh
  • scripts/regen-artifacts.sh

Open the folder on GitHubat commit 10f9ad7

Used in 1 other repository

We found 1 copy of this SKILL.md (exact, near-identical or edited) in other folders. This page covers the copy in PostHog/posthog, which our catalogue first saw on October 7, 2026.

Compare with similar skills

Autoresolving PR 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.

Autoresolving PR Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Autoresolving PR Conflicts this skillPostHog/posthog40k—~4.2kAutomated safety check: PassCustom licence
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

  • 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 PostHog/posthog

All 252 skills in this repo

  • Authoring Log Alerts

    PostHog/posthog

    Official

    Author useful, low-noise log alerts on services in a PostHog project.

    40k GitHub stars~3k tokensUpdated today
    Auto-check passed

  • Diagnosing Stacktrace Symbolication

    PostHog/posthog

    Official

    Help users debug PostHog Error Tracking stack-trace symbolication for any supported platform — JavaScript/TypeScript web, React Native (Hermes), Android (Proguard / R8), or iOS / macOS (dSYM).

    40k GitHub stars~2.2k tokensUpdated today
    Auto-check passed

  • Exploring Apm Traces

    PostHog/posthog

    Official

    Investigates distributed application performance using PostHog APM (OpenTelemetry span) data via MCP.

    40k GitHub stars~3.5k tokensUpdated today
    Auto-check passed

  • Exploring LLM Traces

    PostHog/posthog

    Official

    Debug and inspect LLM/AI agent traces using PostHog's MCP tools.

    40k GitHub stars~4.4k tokensUpdated today
    Auto-check passed

  • Investigate Metric

    PostHog/posthog

    Official

    Diagnose why a product metric changed (dropped, spiked, or plateaued) by orchestrating breakdowns, actors, paths, lifecycle, retention, and annotations queries.

    40k GitHub stars~1.9k tokensUpdated today
    Auto-check passed

  • QA Team

    PostHog/posthog

    Official

    Multi-agent QA review team for code changes. An agent skill from PostHog/posthog.

    40k GitHub stars~4.6k tokensUpdated today
    Auto-check passed

Works with

Categories

Questions about Autoresolving PR Conflicts

What does Autoresolving PR Conflicts do?

Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source…. Autoresolving PR Conflicts is an agent skill from PostHog/posthog, published by the product's own GitHub organization. Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source conflicts with judgment), land one merge commit on the PR head, and flag everything else for a human.

When should I use Autoresolving PR Conflicts?

Autoresolving PR Conflicts fits situations like: running as the scheduled conflict autoresolver; auto-resolve merge conflicts against master; asked to bring a conflicting PR up to date without rewriting its history; terms: conflict sweep.

How do I install Autoresolving PR Conflicts in Claude Code?

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

How do I install Autoresolving PR Conflicts in Codex?

Run `npx skills add PostHog/posthog --skill autoresolving-pr-conflicts -a codex`. Or copy the skill folder (.agents/skills/autoresolving-pr-conflicts in PostHog/posthog) into .agents/skills/autoresolving-pr-conflicts in your project. Codex loads it when a task matches its description.

Can I use Autoresolving PR 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 PostHog/posthog --skill autoresolving-pr-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/autoresolving-pr-conflicts, .gemini/skills/autoresolving-pr-conflicts, .github/skills/autoresolving-pr-conflicts and .opencode/skills/autoresolving-pr-conflicts in your project.

What does Autoresolving PR Conflicts need to run?

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

Does Autoresolving PR Conflicts access the network?

SKILL.md contains no URLs. Its commands use git and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Autoresolving PR 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. The check reads SKILL.md only: the scripts in the folder are not scanned, so read them before running anything.

What licence does Autoresolving PR Conflicts use?

Autoresolving PR Conflicts has a licence file (the repository's licence) that doesn't match a standard licence. Read it on GitHub before reusing the skill.

How many tokens does Autoresolving PR Conflicts use?

About 4.2k tokens (SKILL.md is roughly 17k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 2k tokens, read only when the agent opens those files.

What are the alternatives to Autoresolving PR Conflicts?

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

PostHog (a GitHub organization, an official publisher) maintains it in PostHog/posthog, which has 40,182 GitHub stars. The repository holds 252 skills in this directory. The repository was last updated on October 8, 2026.

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