Inspiration
Every developer knows the pain of merge conflicts—cryptic markers, wrong choices, broken builds. We asked: what if you could see which resolution would pass tests before choosing?
What it does
CodeBeaver is a Chrome extension + GitHub App that tests merge conflict resolutions before you commit. It generates merge code options, runs each in isolated sandboxes, and posts a comparison table showing which pass or fail—plus AI analysis.
How we built it
Probot handles GitHub webhooks, Daytona SDK spins up isolated sandboxes for each resolution option, and Gemini 2.5 Pro generates intelligent merges and conflict analysis. Each option gets tested in a real environment with your actual test suite.
Challenges we ran into
"Accept Both" often creates duplicate functions that still pass builds due to caching—we added verification to catch these. Managing concurrent sandboxes while respecting rate limits and parsing conflict markers reliably took several iterations.
Accomplishments that we're proud of
CodeBeaver understands code semantics, combining functionality without duplication. The comparison table turns a confusing decision into instant clarity.
What we learned
Merge conflicts are semantic problems, not just text problems. Simple strategies can produce syntactically valid but logically broken code.
What's next for CodeBeaver
Support for custom CI pipelines, smart caching to reduce sandbox spin-up time, and auto-resolution of trivial conflicts based on team patterns.
Built With
- api
- daytona-sdk
- github
- google-gemini-2.5-pro
- node.js
- probot
- typescript
Log in or sign up for Devpost to join the conversation.