Merge conflicts are tedious: developers must stop, read both sides, and manually reconcile them before continuing. Our tool automates that first pass. A CLI engine scans a repo for conflicts and sends each one to IBM Bob Shell for a proposed resolution, returning structured tickets with a confidence score and reasoning. High-confidence fixes are auto-resolved; uncertain ones are flagged for review. A web dashboard sits on top: developers and team leads click "Run" to scan a repo, see tickets by status, compare both original sides against the suggested fix, and approve or reject with one click, which rewrites the source file directly. What makes it unique is pairing an LLM-driven CLI with a lightweight ticketing UI, plus GitHub-connected repo access and Slack alerts, so teams learn about conflicts the moment they're created instead of mid-merge, cutting resolution time while keeping a human in the loop for anything ambiguous.
Category tags: