The AI-Powered Merge Conflict Resolver is a VS Code extension that helps developers resolve merge conflicts efficiently using AI. It provides automatic conflict detection and AI-generated resolution suggestions, streamlining the merging process within the VS Code environment.
Features
Detect Merge Conflicts: Automatically identifies merge conflicts in Git repositories.
AI-Powered Resolution: Provides AI-generated suggestions for resolving conflicts.
User Choice Options: Accept the target branch, current branch, or AI-generated resolution.
Syntax Highlighting: Presents conflicts in a webview with clear formatting.
Automatic Formatting: Runs Black formatter on Python files after resolution.
Installation
From VSIX
Download the .vsix package.
Open VS Code and go to the Extensions panel (Ctrl + Shift + X).
Click on the More Options (...) button and select Install from VSIX.
Select the downloaded .vsix file to install.
Usage
Open a project with merge conflicts.
Click on the "Resolve Merge Conflicts" button in the command palette (Ctrl + Shift + P).
The extension will display conflicts in a webview.
Choose an option:
Accept Current: Keep the local branch changes.
Accept Target: Use the remote branch changes.
Accept AI Resolution: Apply AI-generated suggestions.
Once resolved, conflicts are marked as fixed, and Python files are auto-formatted.
Configuration
No additional configuration is required. The extension automatically detects merge conflicts and suggests resolutions.
Dependencies
Simple-Git: Used to interact with Git repositories.
Axios: Handles API requests to the AI backend.
VS Code Webview API: Displays merge conflict resolutions.
