CLI

The @gitwand/cli package provides conflict resolution from the command line. Use it interactively or integrate it into CI pipelines and Git hooks.

Commands

gitwand resolve [files...]

Auto-resolve trivial merge conflicts.

# Auto-discover conflicted files via git
gitwand resolve

# Resolve specific files
gitwand resolve src/config.ts src/utils.ts

# Preview without writing
gitwand resolve --dry-run

# Verbose output with per-hunk details
gitwand resolve --verbose

If no files are specified, GitWand discovers conflicted files automatically via git diff --name-only --diff-filter=U.

gitwand status

Show the conflict status for the current repository.

gitwand status

Options

Flag	Description
--dry-run	Analyze conflicts without writing files
--verbose	Show details for each resolution (line, type, explanation)
--no-whitespace	Don't resolve whitespace-only conflicts
--ci	CI mode: JSON output + exit code 1 if unresolved conflicts remain
--json	Output results as JSON (same behavior as --ci)

CI Integration

Use --ci or --json for machine-readable output and proper exit codes:

gitwand resolve --ci

Exit codes:

• 0 — All conflicts resolved (or no conflicts found)
• 1 — Unresolved conflicts remain

JSON output format:

{
  "version": "0.1.0",
  "timestamp": "2026-04-14T12:00:00.000Z",
  "summary": {
    "files": 2,
    "totalConflicts": 5,
    "autoResolved": 4,
    "remaining": 1,
    "allResolved": false
  },
  "files": [
    {
      "path": "src/config.ts",
      "totalConflicts": 2,
      "autoResolved": 2,
      "remaining": 0,
      "validation": {
        "isValid": true,
        "hasResidualMarkers": false,
        "syntaxError": null
      },
      "resolutions": [
        {
          "line": 15,
          "type": "one_side_change",
          "resolved": true,
          "explanation": "Only one side modified this block",
          "confidence": {
            "score": 95,
            "label": "certain",
            "typeClassification": 100,
            "dataRisk": 5,
            "scopeImpact": 10
          },
          "trace": {
            "selected": "theirs",
            "hasBase": true,
            "summary": "One-side change detected — incoming accepted.",
            "steps": ["..."]
          }
        }
      ],
      "pendingHunks": []
    },
    {
      "path": "src/complex.ts",
      "totalConflicts": 3,
      "autoResolved": 2,
      "remaining": 1,
      "validation": {
        "isValid": false,
        "hasResidualMarkers": true,
        "syntaxError": null
      },
      "resolutions": ["..."],
      "pendingHunks": [
        {
          "line": 42,
          "type": "complex",
          "explanation": "Overlapping edits on both sides.",
          "ours": "const timeout = 5000;",
          "theirs": "const timeout = 10000;\nconst retries = 3;",
          "base": "const timeout = 3000;",
          "trace": {
            "selected": null,
            "summary": "Both sides modified — manual resolution required.",
            "steps": ["..."]
          }
        }
      ]
    }
  ]
}

Each resolution now includes a confidence object (score 0–100 with dimensional breakdown) and a trace recording every classification step. The pendingHunks array contains the ours/theirs/base content for conflicts that need manual or LLM-assisted resolution — making the JSON output directly consumable by AI agents via the MCP server.

Git Hook Integration

Add GitWand to your merge workflow with a post-merge hook:

#!/bin/sh
# .git/hooks/post-merge

# Check for remaining conflicts and auto-resolve what's possible
if git diff --name-only --diff-filter=U | grep -q .; then
  gitwand resolve --verbose
fi

Or use it in a prepare-commit-msg hook after a merge:

#!/bin/sh
# .git/hooks/prepare-commit-msg

if [ "$2" = "merge" ]; then
  gitwand resolve 2>/dev/null
fi