Real-Time Conflict Predictor (Beta)

⚠️ BETA WARNING: This extension is in beta stage. Please test thoroughly before using in production environment.

A proactive VS Code extension for merge conflict detection with GitHub integration.

🎯 Purpose

Help developers detect potential merge conflicts in advance while working on a branch by analyzing changes in master or other branches on the same files. This reduces time loss and errors during merge operations.

✨ Features

📊 File-Based Conflict Prediction

• Checks master branch changes in open files
• Analyzes changes in GitHub open PRs for the same files
• Line-based conflict risk calculation
• Risk levels: High (Red) / Low (Green)

🎨 Visual Warning System

• Status Bar: Real-time risk status display
• Tree View Panel: Detailed risk analysis
• Popup Alerts: Automatic notifications for high-risk situations

⚡ Automatic Analysis

• Automatic check when file is opened
• Updates when file is saved
• Real-time analysis on active editor changes

🔧 GitHub Integration

• GitHub API connection with Personal Access Token
• Scans open PRs
• Automatic repository information detection

📖 Usage

1. Basic Usage

• Open any file
• View conflict risk status in status bar
• Receive alerts for high-risk situations

2. Detailed Analysis

• Open "Conflict Risks" section in Explorer panel
• View files by risk categories
• Get detailed reasons and recommendations for each file

3. Manual Check

• Command Palette (Ctrl/Cmd + Shift + P)
• Run "Check Conflict Risk" command

📸 Screenshots & Features

🔐 GitHub Token Configuration

You can securely configure your Personal Access Token for the extension's GitHub integration. Add your token from Settings > Extensions > Conflict Predictor section.

✅ GitHub Integration Active

When the token is successfully verified, the extension integrates with GitHub and becomes ready for conflict analysis. A notification confirms that the integration is active.

🎯 Command Palette Integration

You can easily access extension commands from VS Code Command Palette (Ctrl/Cmd + Shift + P):

• Check Conflict Risk: Manual conflict risk check
• Configure GitHub Token: GitHub token configuration
• Detailed Risk Analysis: Detailed risk analysis
• Open Conflict Predictor Panel: Open main panel

⚠️ Conflict Risk Detection

The extension automatically provides warnings when it detects potential conflict risks. In this example, a conflict risk has been detected in the HomeView.vue file and notified to the user.

📊 Detailed Risk Analysis Panel

The detailed risk analysis panel shows:

• Potential Conflict Lines: Which lines have conflict risk
• Related GitHub Links: Related Pull Requests and branches
• Pull Requests with Changes: PRs that modify the same file
• Remote Branches with Changes: Remote branches with modifications

Through this panel you can:

• View lines with conflict risk
• Open related PRs on GitHub
• See which developers are working on the same file
• Take necessary precautions before merge operations

🎨 Visual Conflict Highlighting

The extension highlights potential conflict lines in the editor with red color, so you can visually understand which regions require careful attention.