Conflict Radar Panel

Overview

The Conflict Radar Panel is a dedicated sidebar view that shows all detected conflicts across your workspace. At a glance, see which files have conflicts, their severity, and who made the conflicting changes.

Panel Structure

The Conflict Radar organizes information hierarchically:

📊 Conflict Radar
├── 📁 src/
│   ├── 🔴 auth/login.ts (3 conflicts)
│   │   ├── Line 45-52 — Sarah Chen (2h ago)
│   │   ├── Line 78 — Marcus Johnson (yesterday)
│   │   └── Line 112-115 — Sarah Chen (2h ago)
│   └── 🟡 api/users.ts (1 warning)
│       └── Line 23 — Alex Rivera (4h ago)
└── 📁 tests/
    └── 🟡 auth.test.ts (2 warnings)

Features

Severity Badges

Each file shows a badge indicating conflict severity:

Quick Actions

Right-click any item for quick actions:

• Open File — Jump to the file in the editor
• View Diff — See the conflicting changes side-by-side
• Dismiss — Acknowledge and hide this conflict
• Cherry Pick — Apply the remote changes to your branch

File Explorer Integration

Files with conflicts also show badges in VS Code's file explorer:

Filtering & Sorting

Use the panel header controls to filter what you see:

• By Severity — Show only hard conflicts or include warnings
• By Author — Focus on specific teammates
• By Date — Most recent or oldest first

Refresh & Sync

The panel updates automatically when:

• Auto-fetch runs (configurable interval)
• You save a file (if fetchOnSave is enabled)
• You run GitSpectra: Check Now

Manual refresh available via the refresh button in the panel header.

Configuration

{
  "gitspectra.panel.showWarnings": true,     // Include soft warnings
  "gitspectra.panel.groupByFolder": true,    // Group files by directory
  "gitspectra.panel.autoExpand": false       // Auto-expand items on refresh
}