Merge is an interactive command line interface application designed to simplify and accelerate Git merge conflict resolution. It provides a visual interface for reviewing conflicting files and offers streamlined keyboard navigation for handling conflicts. By integrating conflict detection, resolution, and staged merging into a unified and easy-to-use experience, Merge changes the developer experience for beginners who often struggle with understanding merge conflicts.
- ✅ Conflict Detection and Highlighting: Detects merge conflicts in selected files and highlights them with clear separation between current and incoming changes.
- ⚙️ Multiple Resolution Options: Allows you to resolve conflicts by accepting the current changes, incoming changes, a combination of both, or AI-suggested resolutions.
- 🤖 AI-Powered Suggestions: Integration with OpenAI provides suggestions based on context, assisting in complex conflict resolution.
- 💻 Keyboard Bindings: Streamlined keyboard navigation and shortcuts enable rapid conflict resolution.
- 🤩 Visual Conflict Indicators: A user-friendly, color-coded display helps users visually track the sections of code in conflict.
- Python 3.7 or later with the
textualanduvlibraries installed.
-
Clone the repository:
git clone https://github.com/your-username/mergr.git cd mergr -
Install required dependencies:
uv sync
-
(Optional) Set up your OpenAI API key for AI-powered conflict suggestions.
export OPENAI_API_KEY=<sk-yourkey>
To start the application, use:
uv run main.py