AI Merge Resolver

An intelligent GitHub merge conflict resolution tool powered by AI. This application allows you to authenticate with GitHub, view your repositories and pull requests, and get AI-powered suggestions for resolving merge conflicts.

Features

• GitHub OAuth Authentication - Secure login with your GitHub account
• Repository Management - Browse and select from your GitHub repositories
• Pull Request Viewer - View open and closed pull requests with detailed information
• AI-Powered Conflict Resolution - Get intelligent suggestions for resolving merge conflicts using Google Gemini
• Real-time Status Updates - Track conflict resolution progress

Quick Start

1. Install Frontend Dependencies

npm install

2. Set Up Backend

cd backend
npm install
cp env.example .env
# Edit .env and add your Gemini API key

3. Set Up GitHub OAuth

1. Go to GitHub Developer Settings
2. Click "New OAuth App"
3. Fill in the application details:
   • Application name: AI Merge Resolver
   • Homepage URL: http://localhost:3000
   • Authorization callback URL: http://localhost:3000
4. Copy the Client ID and Client Secret

3. Configure Environment Variables

1. Copy the example environment file:

   cp env.example .env

2. Edit .env and add your GitHub OAuth credentials:

   VITE_GITHUB_CLIENT_ID=your_github_client_id_here
   VITE_GITHUB_CLIENT_SECRET=your_github_client_secret_here
   VITE_APP_URL=http://localhost:3000
   

4. Start the Backend Server

cd backend
npm run dev

5. Start the Frontend Development Server

# In a new terminal, from the project root
npm run dev

6. Open your browser to http://localhost:3000

Usage

1. Login: Click "Sign in with GitHub" to authenticate
2. Select Repository: Choose a repository from your GitHub account
3. View Pull Requests: Browse open and closed pull requests
4. Resolve Conflicts: Select a pull request to view merge conflicts
5. AI Suggestions: Get AI-powered recommendations for conflict resolution
6. Apply Changes: Accept AI suggestions or manually resolve conflicts

Development

Available Scripts

• npm run dev - Start development server
• npm run build - Build for production

Environment Variables

• VITE_GITHUB_CLIENT_ID - GitHub OAuth App Client ID
• VITE_GITHUB_CLIENT_SECRET - GitHub OAuth App Client Secret (dev only)
• VITE_APP_URL - Application URL for OAuth redirects
• "GEMINI_KEY"

Contributing

1. Fork the repository
2. Create a feature branch
3. Make your changes
4. Test thoroughly
5. Submit a pull request

License

This project is licensed under the MIT License.

Support

For detailed setup instructions, see GITHUB_SETUP.md.

For issues and questions, please open an issue on GitHub.