fixing-github-merge-conflicts

fixing-github-merge-conflicts is a skill for Claude Code, Codex from Tracer-Cloud/opensre. It costs 63 tokens per session (571 once invoked), scanned A, original, Apache-2.0.

A workflow for resolving merge conflicts in open GitHub pull requests by bringing the repository's base branch into each conflicting request. A pull request is a proposed code change awaiting review or merging.

In plain words
What is it for?
Use it to scan open pull requests for conflicts, merge the base branch into them, wait for checks, and report the resulting status.
Why use it?
It finds only repairable conflicts, handles requests one at a time, and reports cases where a person still needs to decide.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Good fit Use it to scan open pull requests for conflicts, merge the base branch into them, wait for checks, and report the resulting status.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/tracer-cloud/opensre/fixing-github-merge-conflicts
About the project

OpenSRE is an open-source framework for building AI agents that investigate and resolve production incidents using operational data and tools. It is for site reliability engineers who want customizable incident-response workflows, training, and evaluation on their own infrastructure.

Tracer-Cloud/opensre · 11,969 stars · on GitHub · discord.com

Install

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.

Any agent
npx skills add Tracer-Cloud/opensre --skill fixing-github-merge-conflicts
Clone the repo
git clone --depth 1 https://github.com/Tracer-Cloud/opensre

Made for: Claude Code, Codex.

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

agentmods badge for fixing-github-merge-conflicts

README.md
[![agentmods](https://agentmods.dev/badge/skills/tracer-cloud/opensre/fixing-github-merge-conflicts/github.svg)](https://agentmods.dev/skills/tracer-cloud/opensre/fixing-github-merge-conflicts)
Your own site
<a href="https://agentmods.dev/skills/tracer-cloud/opensre/fixing-github-merge-conflicts"><img src="https://agentmods.dev/badge/skills/tracer-cloud/opensre/fixing-github-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.

agentmods 80×15 button for fixing-github-merge-conflicts

Your own site · 80×15
<a href="https://agentmods.dev/skills/tracer-cloud/opensre/fixing-github-merge-conflicts"><img src="https://agentmods.dev/badge/skills/tracer-cloud/opensre/fixing-github-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 63 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 571 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00063 $0.00571
Opus 5.5 $0.00025 $0.00228
Sonnet 5.5 $0.00013 $0.00114
Haiku 4.5 $0.00006 $0.00057

Measured 10d ago against content hash 14bfa3955e76, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

fixing-github-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 10d ago.

The scan reads SKILL.md. This mod also ships 1 executable file (test_merge_conflicts_workflow.py), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

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.

core/agent_harness/prompts/skills/fixing-github-merge-conflicts/SKILL.md · 58 lines

What it actually says

Fixing GitHub merge conflicts

Merge the base branch into each open, same-repository, non-draft pull request that conflicts with it.

Plan

Only when step 1 finds a target, list update_plan before the first fix_github_pr_ci call: step 1 completed, step 2 in_progress with verifies: true, step 3 pending.

  • Step 1. Find the conflicting pull requests with summarize_github_pr_status.
  • Step 2. Merge the base branch into each one with fix_github_pr_ci.
  • Step 3. Reply with one line per new result.

Workflow

1. Find the conflicting pull requests

Call summarize_github_pr_status(owner, repo, conflicts_only=true); the targets have repairable: true and either mergeable: false or mergeable_state: "dirty". Complete when the scan has returned.

2. Merge the base branch into each target

Call fix_github_pr_ci(owner, repo, pr_number) once per target, one at a time; it merges, pushes, waits for the checks, and comments on the pull request when a person must decide. Never run git or gh around it, and never merge a pull request. Complete when every target has a result.

3. Reply

Write one line per target whose result is new (one with already_reported: true is not): its link, then checks_state and any error_kind and error, as returned; with no line left, reply with only the note line. Complete when the reply is sent.

Files

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.

Changes

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.

  1. 10d ago First seen · 58 lines · 63 tokens per session scan A 14bfa3955e76

Subscribe to this mod's changes

fixing-github-merge-conflicts is a skill published in the GitHub repository Tracer-Cloud/opensre (11,969 stars, last pushed today), licensed Apache-2.0. It adds 63 tokens to every session and 571 once invoked, about $0.0003 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-10-06.

Related

Other skills, from other repositories

grafana-expert

Expert-level Grafana dashboards, visualization, data sources, alerting, and production operations. Use when the user mentions dashboards, visualization, monitoring, observability, or alerting, or when the task involves Grafana Architecture, Installation on Kubernetes, Data Sources, or Dashboard JSON.

personamanagmentlayer/pcl · 61 tokens

host_bash

A read-only shell skill for examining files and running diagnostic commands in a restricted environment. A shell is a text interface for operating-system commands.

ongridio/ongrid · 26 tokens

host_restart_service

A tool for restarting approved systemd services, which are background programs managed by Linux's service manager.

ongridio/ongrid · 23 tokens

monitoring-expert

Expert-level monitoring and observability with Prometheus, Grafana, logging, and alerting. Use when the user mentions observability, Prometheus, Grafana, logging, metrics, or alerting, or when the task involves The Three Pillars of Observability, Monitoring Fundamentals, Prometheus Configuration, or Alert Rules.

personamanagmentlayer/pcl · 70 tokens

datadog

Full-stack observability with Datadog APM, logs, metrics, synthetics, and RUM. Use when implementing monitoring, tracing, alerting, or cost optimization for production systems.

bobmatnyc/claude-mpm-skills · 43 tokens

grafana

Build operable Grafana dashboards with template variables, provisioning-as-code, and unified alerts wired to Prometheus/Loki; avoid high-cardinality panels agents love to ship.

alivirgo/Major-AI-Skills · 37 tokens