PR Merge Conflict Resolver
Resolve Azure DevOps and GitHub Pull Request merge conflicts directly inside Visual Studio Code with a clean, side-by-side diff editor, live conflict tracking, and AI-powered conflict resolution.
No browser switching. No manual rebasing.
Resolve, review, and submit merges where you write code.
✨ Key Features
- 🔗 Connect to Azure DevOps & GitHub Git repositories
- 🔐 Authenticate via Personal Access Token (PAT) or OAuth 2.0
- 📂 Browse Projects → Repositories → Pull Requests
- ⚠️ Automatically detect merge conflicts in PRs
- 🧩 Resolve conflicts using a side-by-side diff editor
- 🎯 Accept changes from Source or Target branch
- 🤖 AI-Powered Resolution with multi-LLM support (OpenAI, Azure AI, Gemini, Claude, and more)
- 🧠 LLM Embeddings & Semantic Search with RAG orchestration for intelligent context retrieval
- 📊 Real-time statistics showing conflict resolution progress
- 🚀 Submit resolved merges back to the PR from VS Code
🧠 LLM Embeddings & Semantic Search (NEW)
Advanced RAG-Based Conflict Resolution
The extension now features a sophisticated LLM Embedding Service that uses semantic search with multi-dimensional vectors for intelligent context retrieval:
| Feature |
Description |
| Semantic Search |
Uses cosine similarity to find the most relevant code sections |
| Multi-Dimensional Vectors |
Support for 768D to 4096D embeddings depending on provider |
| Intelligent Code Chunking |
Automatically detects imports, classes, methods, and comments |
| Method-Level Analysis |
Embeds individual method conflicts for targeted resolution |
| Preference Embedding |
Converts your merge preferences into vector space for better context |
| RAG Orchestration |
Combines semantic search results with user preferences for optimal prompts |
Supported Embedding Providers
| Provider |
Embedding Model |
Dimensions |
Notes |
| OpenAI |
text-embedding-ada-002 |
1536D |
Best quality, requires API key |
| Azure OpenAI |
text-embedding-ada-002 |
1536D |
Enterprise deployment |
| Google |
text-embedding-gecko |
768D |
Good performance |
| Ollama |
nomic-embed-text |
4096D |
Local, no API key needed |
| Cohere |
embed-english-v3.0 |
1024D |
Multilingual support |
| Fallback |
TF-IDF |
1536D |
Works offline when APIs unavailable |
How Semantic Search Works
- Content Indexing: Source and target code are chunked intelligently by structure (imports, classes, methods)
- Embedding Generation: Each chunk is converted to a high-dimensional vector using your configured LLM provider
- Preference Embedding: Your AI merge preferences are also embedded for context matching
- Similarity Search: Cosine similarity finds the most relevant code sections for the conflict
- RAG Context Building: Relevant chunks are assembled with similarity scores into the prompt
- Enhanced Resolution: The LLM receives rich, contextually relevant information for better merges
🤖 AI-Powered Conflict Resolution
Multi-LLM Provider Support
The extension supports 7 LLM providers for intelligent conflict resolution:
| Provider |
Models |
Features |
| Azure AI |
GPT-5, GPT-4.1, GPT-4o, o3 |
Enterprise-ready, embeddings support |
| OpenAI |
GPT-5.2 Pro, GPT-5 Codex, GPT-4.1 |
Best coding models, Codex series |
| Google Gemini |
Gemini 3 Pro, 2.5 Flash |
1M context window, free tier |
| Anthropic Claude |
Claude Opus 4.5, Claude Sonnet 4.5 |
Advanced reasoning |
| Ollama |
Llama 3.3, CodeLlama, Mistral |
Local/private, no API key |
| Moonshot Kimi |
Kimi K2, Moonshot V1 |
128K context |
| OpenRouter |
All providers via single API |
Unified access |
How AI Resolution Works
- Select a conflicted file in the merge editor
- Click "Resolve with AI" button
- The AI analyzes both source and target changes with full context
- Receive an intelligent merged resolution
- Review, edit if needed, and accept
🚀 Getting Started
1. Install the Extension
Search for "PR Merge Conflict Resolver" in the VS Code Extensions Marketplace and install it.
2. Open the Extension
Click the PR Merge Conflict Resolver icon in the Activity Bar or use the Command Palette (Ctrl+Shift+P):
PR Merge Conflict: Configure PR Provider
- Click on gear icon of Repositories section or
Ctrl+Shift+P and select PR Merge Conflict: Configure PR Provider
- Choose between Azure DevOps or GitHub as your Git provider
Azure DevOps
When first launched, you'll be prompted to configure:
- Azure DevOps Organization name
- Personal Access Token (PAT) for authentication
- Project - selected from a list or entered manually
- Repository to work with
Project Selection Options:
After entering your organization and PAT, you'll be prompted to choose how to select the project:
| Option |
Description |
When to Use |
| 📋 Select from Project List |
Shows a dropdown of all available projects |
When your PAT has permission to list all projects in the organization |
| ✏️ Enter Project Name Manually |
Type the project name directly |
When you only have access to specific projects (no org-wide project list permission) |
Tip: If fetching the project list fails, you'll automatically be offered the option to enter the project name manually. This ensures the extension works for users with any level of access permissions.
GitHub
For GitHub repositories:
- GitHub Personal Access Token with
repo scope
- Owner/Organization name
- Repository selection
4. Select a Pull Request
- Browse available Pull Requests in the selected repository
- PRs with merge conflicts are automatically highlighted
- Select a PR to view its conflicted files
5. Resolve Conflicts
- Click on any conflicted file to open the merge editor
- View source and target branches side-by-side
- Accept changes from either branch or edit manually
- Save your resolution
Edit using quick actions: you can edit manually or use the Accept from Source/Target buttons to quickly resolve sections.
6. Submit Changes To PR
- Once all conflicts in a file are resolved, click Submit Merge to PR
- Enter a commit message
- Changes are pushed directly back to your Azure DevOps PR
To use AI-powered conflict resolution, you need to configure an LLM provider:
1. Open LLM Configuration
Use the Command Palette (Ctrl+Shift+P) and run:
PR Merge Conflict: Configure LLM
2. Select LLM Provider
Choose from the available providers:
- Azure AI - Enterprise Azure OpenAI deployments
- OpenAI - Direct OpenAI API access
- Google Gemini - Google's AI with large context windows
- Anthropic Claude - Advanced reasoning capabilities
- Ollama - Local models (free, no API key needed)
- Moonshot Kimi - Large context Chinese/English models
- OpenRouter - Access multiple providers with one API key
3. Enter API Key
- For cloud providers (OpenAI, Azure, Gemini, Anthropic, etc.), enter your API key
- For Ollama, no API key is required - just ensure Ollama is running locally
- Azure AI: Enter your Azure OpenAI endpoint (e.g.,
https://your-resource.openai.azure.com)
- Ollama: Enter your local endpoint (default:
http://localhost:11434)
5. Select Models
- Choose the chat model for conflict resolution
- Optionally select an embedding model for enhanced context understanding
6. Verify Configuration
Once configured, you'll see a confirmation message. You can now use the "Resolve with AI" button on any conflicted file.
7. AI Starts Resolving
Clicking the button sends the conflict data to the selected LLM, which processes it and returns a merged resolution. During this process, you'll see a loading indicator and see cancel button if you wish to abort.
7. AI-Powered Conflict Resolution
The AI suggests a merged resolution based on the context from both branches. You can review the file changes and Submit Merge To PR.
Tip: For best results with code conflicts, use models optimized for coding like Gemini 3 Pro, Claude Opus 4.5, Claude Sonnet 4.5, GPT-5.2 Pro, or KIMI K2.
🧭 Workflow Overview
- Connect to Azure DevOps with your PAT
- Select organization, project, and repository
- Choose a Pull Request with conflicts
- View conflicted files in the Conflict Files panel
- Resolve conflicts using the side-by-side editor
- Track progress in the Conflict Statistics panel
- Submit resolved files back to the PR
🔐 Authentication
The extension supports multiple authentication methods:
Azure DevOps
Personal Access Token (PAT) - Recommended
- Go to Azure DevOps → User Settings → Personal Access Tokens
- Create a new token with:
- Code (Read & Write) permissions
- Pull Request Threads (Read & Write) permissions
- Copy the token and paste it when prompted by the extension
OAuth 2.0
OAuth authentication is also supported for seamless integration with your Azure DevOps account.
GitHub
Personal Access Token
- Go to GitHub → Settings → Developer Settings → Personal Access Tokens
- Generate a new token (classic) with:
- repo scope (Full control of private repositories)
- Copy the token and use it in the extension configuration
Security: All credentials are stored securely using VS Code's Secret Storage API. Tokens are never logged or transmitted outside of Azure DevOps/GitHub API calls.
📊 Features in Detail
Conflict Detection
- Automatically scans PRs for merge conflicts
- Displays conflicted files grouped by status (Pending/Resolved)
- Shows real-time statistics on conflict resolution progress
Side-by-Side Merge Editor
- Left panel: Source branch changes
- Right panel: Target branch / merged view
- Quick actions to accept from source or target
- Manual inline editing for complex conflicts
Progress Tracking
- Visual indicators for pending and resolved conflicts
- Live statistics panel showing:
- Total conflicts count
- Pending conflicts
- Resolved files
- Overall resolution percentage
Direct PR Integration
- Submit resolved files directly to the PR
- Add commit messages for each resolution
- No need to switch to browser or use git commands
🛠 Requirements
- Visual Studio Code version
1.85.0 or higher
- Azure DevOps or GitHub account with access to repositories
- Personal Access Token with appropriate permissions:
- Azure DevOps: Code (Read & Write), Pull Request Threads (Read & Write)
- GitHub: repo scope
- LLM API Key (optional, for AI-powered resolution):
- Microsoft Foundry (Azure AI), OpenAI, Gemini, Anthropic, etc.
- Or use Ollama for local, free AI resolution
📦 Extension Settings
Configure the extension through VS Code settings:
Provider Settings
prMergeConflictResolver.provider: Git provider (azureDevOps or github)prMergeConflictResolver.azureDevOps.organization: Azure DevOps organization nameprMergeConflictResolver.azureDevOps.project: Azure DevOps project nameprMergeConflictResolver.azureDevOps.repository: Azure DevOps repository nameprMergeConflictResolver.github.owner: GitHub owner/organization nameprMergeConflictResolver.github.repository: GitHub repository name
LLM Settings
prMergeConflictResolver.llm.provider: LLM provider (azure, openai, gemini, anthropic, grok, deepseek, ollama, kimi, openrouter)prMergeConflictResolver.llm.model: Model ID for the selected providerprMergeConflictResolver.llm.embeddingModel: Embedding model for RAG-based resolution
Diff Settings
prMergeConflictResolver.diffContext: Number of context lines in diff (default: 3)prMergeConflictResolver.autoRefreshInterval: Auto-refresh interval in seconds (0 to disable)
🐛 Troubleshooting
"Failed to fetch repositories"
- Verify your PAT has the correct permissions
- Check that your organization name is correct
- Ensure you have access to the specified project
"Command not found" errors
- Reload VS Code window (
Ctrl+Shift+P → "Reload Window")
- Check the extension is activated in the Extensions panel
Conflicts not showing
- Click the refresh icon in the Pull Requests panel
- Verify the PR actually has merge conflicts in Azure DevOps
📄 License
This extension is licensed under the MIT License.
🤝 Support
For issues, feature requests, or contributions:
- Contact: codextio.dev@gmail.com
🎯 Roadmap
Features completed:
- ✅ Azure DevOps support
- ✅ GitHub support
- ✅ Side-by-side merge editor
- ✅ Real-time conflict statistics
- ✅ Multi-LLM provider support (7 providers)
- ✅ AI-powered conflict resolution
- ✅ RAG-based context understanding (in memory limits)
- ✅ LLM Embeddings with semantic search (cosine similarity)
- ✅ Multi-dimensional vector support (768D - 4096D)
- ✅ Intelligent code chunking (imports, classes, methods)
- ✅ Preference embedding for personalized resolution
Future enhancements planned:
- Bulk conflict resolution
- Advanced diff algorithms
- Conflict resolution templates
- Team collaboration features
📋 Release Notes
v1.0.25 (February 2026)
🔍 Search & UX Improvements
- NEW: In-panel search modal with
Ctrl+F shortcut for both Source and Target views
- NEW: Real-time search highlighting with match navigation (Enter/Shift+Enter)
- NEW: Search results counter showing current position (e.g., "3/10")
- FIXED: "Accept Source" button now properly updates target view with source content
- FIXED: Scroll position preserved when toggling edit mode in target view
- FIXED: LLM status label centered in header area
v1.0.24 (February 2026)
✨ AI Summary & UI Improvements
- NEW: Enhanced AI Summary Modal with two sections:
- "Conflict Resolutions" - shows actual code changes (statements, methods, line changes)
- "Preferences Resolutions" - shows method preference decisions
- NEW: Resolution status labels with color coding ("Used Source", "Kept Target", "Merged")
- NEW: AI Summary now displays for all successful resolution scenarios (Stage 1, Stage 2, Programmatic Fix)
- IMPROVED: Green highlighting for all resolved conflicts in target view
- IMPROVED: Local Analysis modal with green radio buttons and conditional Apply button
- FIXED: Template rendering issues with Handlebars syntax
- FIXED: Edit icon display in toolbar
- CLEANED: Removed debug console.log statements
v1.0.23 (February 2026)
🧠 LLM Embeddings & Semantic Search
- NEW: LLM Embedding Service with multi-provider support
- NEW: Semantic search using cosine similarity for intelligent context retrieval
- NEW: Multi-dimensional vector support (768D - 4096D depending on provider)
- NEW: Intelligent code chunking that detects imports, classes, methods, and comments
- NEW: Method-level conflict embedding for targeted resolution
- NEW: User preference embedding for personalized AI responses
- NEW: RAG orchestration combining semantic search with user preferences
- NEW: Automatic fallback to TF-IDF when LLM embedding APIs are unavailable
- IMPROVED: Enhanced AI resolution prompts with similarity scores and context
v1.0.22 (January 2026)
🤖 AI Merge Preferences & Local Analysis Improvements
- NEW: AI Merge Preferences form with 9 configurable options
- NEW: Method-level conflict decisions (source/target/AI merge)
- NEW: Special instructions support for custom merge behavior
- NEW: Open-Router LLM provider with manual model option
- NEW: Local Analysis modal with improved UI
- NEW: Method/function signature conflict detection support
- Added vertical scrollbars to source/target code blocks
- Reduced stat card heights in Local Analysis Summary View
v1.0.21 (January 2026)
✨ Enhanced Azure DevOps Configuration
- NEW: Manual project name entry option for users with restricted project list permissions
- IMPROVED: Automatic fallback to manual entry when project list fetch fails
- IMPROVED: Flexible project selection workflow accommodating various permission levels
🐛 Bug Fixes
- FIXED: Removed file in Pull Request now handled correctly and resolved without errors
v1.0.20 (January 2026)
🚀 Initial Release
📊 Local Analysis
- Added local conflict analysis without LLM requirement
- Statement-level change detection
- Source/target code comparison view
- Summary statistics for local analysis
v1.0.19 (December 2025)
🤖 Multi-LLM Provider Support
- Added 7 LLM providers (Azure AI, OpenAI, Google Gemini, Anthropic Claude, Ollama, Moonshot Kimi, OpenRouter)
v1.0.0 (December 2025)
- Azure DevOps integration
- GitHub integration
- Side-by-side merge editor
- Real-time conflict statistics
- Direct PR submission
- PAT and OAuth authentication
⚡ Powered by Codextio
