ConflictCraft

ConflictCraft is a deterministic Git conflict visualizer and resolution engine.

Full Tutorial

• docs/ConflictCraft-Full-Tutorial.md

Stack

• C++: core parser, diff3-style hunk analysis, graph generation
• Python: deterministic smart rules and explanations
• TypeScript/JavaScript: VS Code extension and 4-pane webview UI
• JSON: schema contracts between layers
• Shell/PowerShell: CLI and Git mergetool integration

Marketplace-Safe Extension Backend

• The VS Code extension bundles its own backend under vscode-extension/backend/.
• The extension executes C++ and Python only from that bundled backend path.
• It does not execute backend scripts from the user's workspace.
• Platform-specific core binaries are resolved by OS at runtime.

Repository Layout

• core/ C++ engine
• python_engine/ smart rule engine
• vscode-extension/ VS Code extension
• schemas/ strict JSON contracts
• scripts/ CLI + git integration
• docs/ architecture and operations

Quick Start

One-step setup (recommended)

Unix (Linux + macOS):

bash scripts/conflictcraft setup

Windows:

powershell -ExecutionPolicy Bypass -File scripts/conflictcraft.ps1 setup

Build core

Unix (Linux + macOS):

make core

Windows:

mingw32-make core

Run tests

Unix (Linux + macOS):

make test

Windows:

mingw32-make test

Resolve a conflicted file

Unix (Linux + macOS):

./scripts/conflictcraft resolve path/to/conflicted.file --write

Windows:

./scripts/conflictcraft.ps1 resolve path\to\conflicted.file --write

Install ConflictCraft as a device command

Unix (Linux + macOS):

bash scripts/install-device.sh
conflictcraft doctor

Windows:

powershell -ExecutionPolicy Bypass -File scripts/install-device.ps1
conflictcraft doctor

New CLI commands

Unix (Linux + macOS):

bash scripts/conflictcraft help

Windows:

powershell -ExecutionPolicy Bypass -File scripts/conflictcraft.ps1 help

Key commands:

• setup [--backend-only]
• doctor
• scan [path]
• rules
• samples list
• samples run <import|whitespace|json|signature> [--no-write] [--explain]
• core-merge --base <file> --ours <file> --theirs <file> [--out <file>]
• resolve <file> [--write|--no-write] [--explain]
• resolve-all <path> [--write|--no-write] [--explain]
• git-setup
• git-resolve [--write|--no-write] [--explain]
• install
• uninstall

VS Code extension

cd vscode-extension
npm install
npm run compile

Git Mergetool (global)

Unix (Linux + macOS):

bash scripts/install-mergetool.sh

Windows:

powershell -ExecutionPolicy Bypass -File scripts/install-mergetool.ps1

Global command uninstall: Unix (Linux + macOS):

bash scripts/uninstall-device.sh

Windows:

powershell -ExecutionPolicy Bypass -File scripts/uninstall-device.ps1