The Problem
Teams discover conflicts at the worst possible moment: after review, after CI, when the merge queue stalls and the release train waits. “This branch no longer merges” is a diagnosis delivered at the funeral.
The information needed to predict it existed weeks earlier — every open PR pair already shares files and hunks that answer the question.
The Insight
Every pair of open PRs already contains the answer: overlapping files, overlapping lines. Someone just has to look.
The Instrument
conflictcast is a Probot GitHub App that listens to pull_request events, compares every pair of open PRs, and escalates from broad shared-file overlap to precise overlapping-line analysis when configured.
Results land where the team already watches: check runs on the head commit and comments in the PR thread — no new dashboard to adopt. SQLite keeps the analysis state deduped across pushes.
From webhook to warning
- PR opened, pull_request; connects to webhook
- webhook, Probot; connects to pairwise analysis
- pairwise analysis, file → line; connects to check run, PR comment
- check run, on head commit
- PR comment, risk signal
- .conflictcast.yml, thresholds · ignores; connects to pairwise analysis
Configured per repo; HIGH risk means overlapping line ranges in a shared file.
Spec
- Stack
- Node 22 · TypeScript 5.7 · Probot · SQLite
- Thresholds
- file = any shared file · line = hunk overlap for HIGH
- Guard
- Skips repos with more than 50 open PRs (posts CF005)
- Config
- .conflictcast.yml — ignore globs, commentOnLow, failCheck
- Permissions
- checks:write · contents:read · issues:write · pull_requests:read
- Deploy
- Self-hosted Docker — no hosted service
- Quick start
docker build -t conflictcast https://github.com/Meru143/conflictcast.git
The Outcome
No tagged release yet: you run conflictcast as your own GitHub App, built from source, and its README demo replays the real check and comment payloads it produces for a HIGH-risk PR pair in an integration fixture. Built so the warning moves from merge time to PR-open time, when resolving a conflict is still a conversation instead of an incident.