fix-conflicts

fix-conflicts is a command for Claude Code from dagster-io/dagster. It costs 10 tokens per session (238 once invoked), scanned C, original, Apache-2.0.

A command that resolves merge conflicts during a Git rebase and continues the rebase until it finishes. A rebase reapplies your commits on top of newer commits, while conflicts are places where Git cannot choose between changes.

In plain words
What is it for?
Use it to resolve each conflicted file, run required checks, continue the rebase, verify completion, and push the updated branch.
Why use it?
It gives a repeatable process for checking conflicts, staging resolutions, continuing the rebase, and pushing the rewritten branch. It reduces the chance of leaving the repository in an unfinished rebase state.

Command for Claude Code

About the project

Dagster is a platform for developing, running, and observing data assets, such as datasets and the processes that produce them. It is used to organize and automate data workflows.

dagster-io/dagster · 16,073 stars · on GitHub

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 commands/dagster-io/dagster/fix-conflicts
Clone the repo
git clone --depth 1 https://github.com/dagster-io/dagster

Made for: Claude Code.

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

README.md
[![agentmods](https://agentmods.dev/badge/commands/dagster-io/dagster/fix-conflicts.svg)](https://agentmods.dev/commands/dagster-io/dagster/fix-conflicts)
Your own site
<a href="https://agentmods.dev/commands/dagster-io/dagster/fix-conflicts"><img src="https://agentmods.dev/badge/commands/dagster-io/dagster/fix-conflicts.svg" alt="Measured on agentmods" height="20"></a>
Per session 10 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 238 The whole file, excluding the scripts and references it only reads on demand.
Security scan C 1 finding. Scan, not verified.
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 $0.00010 $0.00238
Opus 5 $0.00005 $0.00119
Sonnet 5 $0.00002 $0.00048
Haiku 4.5 $0.00001 $0.00024

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

Security

Grade C, and why

fix-conflicts scanned grade C with 1 finding 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 5d 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.

Hidden instructionshighPrompt injection

Directives inside HTML comments, invisible characters or bidirectional overrides are read by the model and not by the person reviewing the file.

<!-- prettier-ignore -->
.claude/commands/erk/fix-conflicts.md · 30 lines

What it actually says

Fix Merge Conflicts

Fix all merge conflicts and continue the git rebase.

Steps

  1. Check status - Run git status to understand the state of the rebase and identify conflicted files

  2. For each conflicted file:

@../../../.erk/docs/kits/erk/includes/conflict-resolution.md

  1. After resolving all conflicts:

    • If project memory includes a precommit check, run it and ensure no failures
    • Stage the resolved files with git add
    • Continue the rebase with git rebase --continue
  2. Loop - If the rebase continues with more conflicts, repeat the process

  3. Verify completion - Check git status and recent commit history to confirm success

  4. Push changes - After rebase, the branch will have diverged from origin. Push the rebased branch:

    • For Graphite users: gt submit (or gt ss)
    • For git-only users: git push --force-with-lease
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. 5d ago First seen · 30 lines · 10 tokens per session scan C ef528fc55f9f

Subscribe to this mod's changes

fix-conflicts is a command published in the GitHub repository dagster-io/dagster (16,073 stars, last pushed 7d ago), licensed Apache-2.0. It adds 10 tokens to every session and 238 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it C with 1 finding (hidden instructions). No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.