The Mediator

Home Section
Features Section
Workflow/Path to Clarity
Analysis Page
History Page
Sign Up Page
Sign In Page

Inspiration

Git merge conflicts are one of the biggest pain points in collaborative software development. Existing tools show conflicting lines of code but rarely explain why the conflict happened or which resolution is the safest. I wanted to build an AI-powered assistant that makes merge conflicts easier to understand and resolve.

What it does

The Mediator is an AI-powered web application that analyzes Git merge conflicts and provides explainable recommendations. It explains branch intent, identifies architectural risks, summarizes conflicts, and suggests the safest merge strategy. Every analysis is securely stored so developers can revisit previous reports.

How we built it

The project was built using React, TypeScript, Vite, Express.js, Firebase Authentication, Cloud Firestore, Google Gemini API, Vercel, and Render. During OpenAI Build Week, I used OpenAI Codex for implementation, refactoring, and debugging, while GPT-5.6 helped with architecture discussions, code reviews, prompt refinement, and documentation.

Challenges we ran into

The biggest challenge was safely inspecting Git repositories without executing untrusted code. I also solved deployment issues between the frontend and backend, configured Firebase Authentication, and improved the quality of AI-generated explanations.

Accomplishments that we're proud of

Built a complete AI-powered web application
Implemented explainable merge conflict analysis
Added secure authentication and persistent analysis history
Successfully deployed the project with a production-ready architecture

What we learned

This project deepened my understanding of Git internals, AI-assisted software development, secure backend design, deployment workflows, and building reliable full-stack applications.