fix-merge-conflicts

fix-merge-conflicts is a skill for Claude Code, Codex from bitsocialnet/seedit. It costs 47 tokens per session (623 once invoked), scanned A, original, GPL-3.0.

A Git workflow tool that resolves merge conflicts, which happen when competing branch changes affect the same code.

In plain words
What is it for?
It resolves all conflicts on the current branch, validates the build, and creates a commit.
Why use it?
It removes the manual work of resolving conflicts and checks that the project still builds afterward.

Skill for Claude CodeCodex

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.

agentmods
npx agentmods add skills/bitsocialnet/seedit/fix-merge-conflicts
Any agent
npx skills add bitsocialnet/seedit --skill fix-merge-conflicts
Clone the repo
git clone --depth 1 https://github.com/bitsocialnet/seedit

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 fix-merge-conflicts

README.md
[![agentmods](https://agentmods.dev/badge/skills/bitsocialnet/seedit/fix-merge-conflicts.svg)](https://agentmods.dev/skills/bitsocialnet/seedit/fix-merge-conflicts)
Your own site
<a href="https://agentmods.dev/skills/bitsocialnet/seedit/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/bitsocialnet/seedit/fix-merge-conflicts.svg" alt="Measured on agentmods" height="20"></a>
Per session 47 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 623 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin unknown 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 $0.00047 $0.00623
Opus 5 $0.00023 $0.00311
Sonnet 5 $0.00009 $0.00125
Haiku 4.5 $0.00005 $0.00062

Measured today against content hash fff0d8c9d5f1, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

fix-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 today.

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.

.claude/skills/fix-merge-conflicts/SKILL.md · 84 lines

The source is not reproduced here

Licensed GPL-3.0

The repository is licensed GPL-3.0, which this catalogue does not treat as permission to reproduce the file. Read it at the source.

Read it on GitHub

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. today First seen · 84 lines · 47 tokens per session scan A fff0d8c9d5f1

Subscribe to this mod's changes

fix-merge-conflicts is a skill published in the GitHub repository bitsocialnet/seedit (418 stars, last pushed today), licensed GPL-3.0. It adds 47 tokens to every session and 623 once invoked, about $0.0002 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-09-03.

Related

Other skills, from other repositories

debug-agent

Systematic evidence-based debugging using runtime logs. Generates hypotheses, instruments code with NDJSON logs, guides reproduction, analyzes log evidence, and iterates until root cause is proven with cited log lines. Use when the user reports a bug, unexpected behavior, or asks to debug an issue.

bitsocialnet/5chan · 60 tokens

playwright-cli

Automates browser interactions for web testing, form filling, screenshots, and data extraction. Use when the user needs to navigate websites, interact with web pages, fill forms, take screenshots, test web applications, or extract information from web pages.

bitsocialnet/5chan · 52 tokens

profile-browsing

Profile app performance while browsing, collecting Web Vitals and React rerender data via react-scan. Orchestrates sequential profiler subagents via playwright-cli to capture navigation timing, long tasks, layout shifts, LCP, React commit counts, render bursts, and per-component render data without saturating the…

bitsocialnet/5chan · 88 tokens

code-quality-review

Advisory code quality review for current diffs before finishing, committing, pushing, or opening a PR. Use when asked to review code quality, run a final quality pass, inspect AI-generated changes, or check for over-engineering. Reports actionable suggestions only; does not block or edit unless explicitly asked.

bitsocialnet/5chan · 66 tokens

release

Automate a full 5chan release — analyze commits, update release body and blotter, bump version, generate changelog, commit, tag, and push. Use when the user says "release", "new version", "cut a release", "prepare release", or provides a version number to ship.

bitsocialnet/5chan · 64 tokens

review-and-merge-pr

Review an open GitHub pull request, inspect feedback from Cursor Bugbot, CodeRabbit, CI, and human reviewers, decide which findings are valid, implement fixes on the PR branch, and merge the PR into master when it is ready. Use when the user says "check the PR", "address bugbot comments", "handle CodeRabbit feedback"…

bitsocialnet/5chan · 87 tokens