I got tired of merge conflicts cropping up on my open PRs, so I built MergeBetter - a GitHub App that warns you before conflicts happen.
What it does:
Watches your team’s open PRs and detects when two branches touch the same files/lines in potentially conflicting ways.
Posts a single, tidy PR comment with the overlap and links.
No CI setup or YAML needed. Just install the GitHub App, pick repos, done.
Code never leaves GitHub. We only read PR diffs, never store source.
Why:
Even with good branch hygiene, people still step on each other’s toes. If two engineers are changing the same code at the same time, that’s probably a conversation worth having sooner rather than later. MergeBetter makes that conversation happen earlier, when it’s cheap.
Details:
Works with org or personal repos. You can install it in “selected repositories” if you want to trial safely.
It’s polite: fewer API calls, caches results, and updates one comment instead of spamming.
14-day free trial, then pricing is based on active members (not repos or PR count).
Security/privacy page is up; happy to answer questions.
Roadmap:
More granular hotspot analytics: see where conflicts cluster over time within files.
Smarter descriptions of conflicts.
GitHub Marketplace listing (currently billing via Stripe).
If you try it:
Install the GitHub App (takes ~1 min), push a PR or two, and let me know what breaks or annoys you. Feature requests, bug reports, and roasts are all welcome.
I’ll be around in the comments today.
No comments yet.
