fix-merge-conflicts

fix-merge-conflicts is a command for Claude Code, Cursor from 10xdev-startup/template-nodejs-express-next-supabase. It costs 0 tokens per session (577 once invoked), scanned A, original, no licence file.

A command that resolves all merge conflicts on the current Git branch without interactive prompts, then checks that the repository builds and tests.

In plain words
What is it for?
Use it to repair a conflicted branch and verify that the result is buildable and tested.
Why use it?
It helps recover a working branch after Git combines incompatible changes from different branches.

Command for Claude CodeCursor

Written for Cursor and Claude Code: installed under .cursor/, but also a Claude Code command (commands/*.md).

Good fit Use it to repair a conflicted branch and verify that the result is buildable and tested.

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/10xdev-startup/template-nodejs-express-next-supabase/fix-merge-conflicts
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.

Clone the repo
git clone --depth 1 https://github.com/10xdev-startup/template-nodejs-express-next-supabase

Made for: Claude Code, Cursor.

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/commands/10xdev-startup/template-nodejs-express-next-supabase/fix-merge-conflicts/github.svg)](https://agentmods.dev/commands/10xdev-startup/template-nodejs-express-next-supabase/fix-merge-conflicts)
Your own site
<a href="https://agentmods.dev/commands/10xdev-startup/template-nodejs-express-next-supabase/fix-merge-conflicts"><img src="https://agentmods.dev/badge/commands/10xdev-startup/template-nodejs-express-next-supabase/fix-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 fix-merge-conflicts

Your own site · 80×15
<a href="https://agentmods.dev/commands/10xdev-startup/template-nodejs-express-next-supabase/fix-merge-conflicts"><img src="https://agentmods.dev/badge/commands/10xdev-startup/template-nodejs-express-next-supabase/fix-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 0 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 577 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 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.1 $0.00000 $0.00577
Opus 5.5 $0.00000 $0.00231
Sonnet 5.5 $0.00000 $0.00115
Haiku 4.5 $0.00000 $0.00058

Measured 2mo ago against content hash c4cf48e344d4, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, 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 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.

.cursor/commands/fix-merge-conflicts.md · 44 lines

The source is not reproduced here

No licence file

A repository with no LICENSE is all rights reserved by default, so the body is not copied here. The metadata, the measurements and the link are.

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. 2mo ago First seen · 44 lines · 0 tokens per session scan A c4cf48e344d4

Subscribe to this mod's changes

fix-merge-conflicts is a command published in the GitHub repository 10xdev-startup/template-nodejs-express-next-supabase (2 stars, last pushed 2mo ago), with no licence file. It costs nothing until one of its globs matches a file; then it loads 577 tokens. 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-31.

Related

fix-merge-conflicts compared with commands from other repositories

fix-merge-conflicts next to 6 commands from other repositories
ModTypeStarsLast pushLicenceScanTokensWorks with
fix-merge-conflicts10xdev-startup/template-nodejs-express-next-supabaseCommand22mo agononeA0Claude Code, Cursor
merge-conflict-analysisrjmurillo/ai-agentsCommand49yesterdayMITA0GitHub Copilot
release-notesOpenHands/extensionsCommand176yesterdayMITA44Claude Code
commitechoVic/blade-codeCommand18124d agoMITA8Claude Code
repo-audittractorjuice/arc-kitCommand2.3k2d agononeA29Claude Code
propsmill/infrahub-mcpCommand10yesterdayApache-2.0A18Claude Code
codex-reviewoalders/kitchen-sinkCommand53d agoMITA41Claude Code