Git Conflict Resolver

Git Conflict Resolver is a Visual Studio Code extension focused on making Git merge conflicts easier to inspect, compare, and resolve without leaving the editor.

Screenshots

Features

• Side-by-side conflict comparison for ours and theirs
• Optional base panel support for diff3 style conflicts
• Live output preview while conflicts are being resolved
• Block-level and line-level conflict selection
• Manual output editing when the merge needs a custom result
• Automatic file staging with git add after save
• Conflict discovery through the editor and sidebar view

Usage

Open the merge tool with one of the following entry points:

• Command Palette: Git Conflict Resolver: Open Merge Tool
• Editor title/context menu: Open Merge Tool
• Keyboard shortcut: Ctrl+Shift+M on Windows/Linux or Cmd+Shift+M on macOS
• Sidebar: select a file from Conflicted Files

Configuration

{
  "gitConflictResolver.autoDetect": true,
  "gitConflictResolver.diffVisualizationStyle": "connections"
}

When autoDetect is enabled, the extension prompts to open the merge tool whenever a conflicted file becomes the active editor.

Set gitConflictResolver.diffVisualizationStyle to classic if you want to disable the connector-style merge visualization and keep the traditional side-by-side view only.

Development

This project currently uses plain JavaScript and static webview assets, so there is no build step.

1. Open the repository in VS Code.
2. Press F5 to launch an Extension Development Host.
3. Open a repository with merge conflicts and use the extension normally.
4. Run npm run check:syntax before submitting changes.

Project Docs

• Contributor guide: CONTRIBUTING.md
• Architecture and file responsibilities: docs/ARCHITECTURE.md

License

This project is licensed under the MIT License - see the LICENSE file for details.