MRGR is a VS Code extension designed to simplify merge conflict resolution. With a clean UI and AI-assisted merging, developers can resolve conflicts faster and with more confidence than ever before.
- Clear Multi-Panel UI – Easily visualize the original, incoming, and merged code side by side.
- One-Click Merge Controls – Click arrows to copy changes from either branch into the merged file.
- AI-Powered Conflict Resolution – Automatically resolve conflicts by leveraging OpenAI’s API.
- Interactive Editing – Edit AI-generated merges manually for precise control.
- Seamless Integration with VS Code – Resolve conflicts directly inside your editor.
- Commit Merges Instantly – Finalize and save your resolutions with a single click.
- VS Code v1.75.0 or later
- Node.js v16+ (required for dependencies)
- OpenAI API Key (if using AI-powered merging)
To install Node.js, visit nodejs.org.
Once published, install MRGR directly from the VS Code Extensions Marketplace.
Until then, you can install MRGR manually:
- Clone this repository:
git clone https://github.com/your-repo/mergeai.git