/git-conflicts

Make it your own.

In Claude Code, use the slash command and add your context. In Codex, select git-conflicts from the just-vibe skill picker, then send the same brief.

Version 0.11.0 also supports /jv git-conflicts, /just-vibe git-conflicts and /jv:git-conflicts in Claude. See shortcut setup and context examples.

What the agent does

1. Read the merge base, both sides and their callers to establish each change's intent.
2. Resolve the combined behavior rather than choosing a side wholesale, and regenerate derived files from their sources.
3. Check the combined behavior.
4. All changes are owned by the user. Add no agent/model self-attribution, AI-generated signature, badge, or agent Co-authored-by trailer to commits, PRs, comments, release notes or messages. Use the existing user Git identity; preserve legitimate human attribution and required third-party notices.

Inputs

• active merge/rebase/cherry-pick conflicts and intended behavior.

Optional context: scope, references, constraints, successCriteria, environment, mode, budget.

Scope

Reads

Resolve conflicted paths; continuing/finalizing the Git operation follows the requested scope.

Writes

Apply: only the requested local changes and relevant isolated verification. Inspect/plan requests remain inspection/planning. External actions require their exact action and target in session authorization.

Mode

Apply; active merge/rebase/cherry-pick conflicts and intended behavior.

Prerequisites

Git, exact repository/worktree, and readable refs/index. Record branch, HEAD, staged/unstaged/untracked state before mutation. Preserve unrelated edits and never default to broad staging, hard reset, clean, force push, or history rewriting.

Expected output

• Resolved files with the rationale for each nontrivial conflict, preserved behaviors, test results and the remaining operation state.

How the work is checked

• Both legitimate feature changes survive; unresolved policy conflicts remain explicit rather than arbitrarily chosen.
• Review newly prepared commit/PR/message text, including template or hook additions, for agent self-attribution before submission; verify the resulting artifact when available. Do not silently rewrite existing history or remove human credits.

When to stop or clarify

• Never abort or reset an operation automatically. Identify unrelated edits before staging resolved files.

Handling missing context

Infer

Read repository root, HEAD, branch, refs and staged/unstaged/untracked distinctions; use the configured human identity.

Assume

Limit an ambiguous inspection to the current repository and report that scope; preserve all existing changes.

Ask

Before mutation, resolve uncertain commit membership, destination ref or history-rewrite intent; do not ask again about already authorized exact actions.

Technical guidance

Evidence

Read merge-base, both sides, callers and whether the operation is merge, rebase or cherry-pick.

Method

Reconstruct both intended behaviors; resolve source manifests before regenerating outputs. Explain side identity using the actual operation.

Pitfall

During rebase, ours/theirs terminology is easy to invert; deleting conflict markers does not establish semantic correctness.

Check

Exercise a behavior contributed by each side and inspect operation state before continuing the requested operation.

Situational decisions

When the sides encode incompatible product policy: Leave that conflict explicit and resolve independent files while requesting the actual decision.

The coding agent follows this workflow using its available tools. Installation does not grant service access or guarantee an outcome. Read the compatibility notes.

Keep exploring