Auxilio: Semantic Merge Guard

The Problem: Every software team relies on Git to combine code from multiple developers, but Git's merge logic has a critical blind spot: it only checks whether two people edited the same line of code. It has no understanding of what a change is actually trying to do. This means two developers can each make a change that is individually sound, harmless, and passes review — but when merged together, their combined effect silently breaks the business logic. For example, one developer lowers a discount threshold from Rs 500 to Rs 200 to attract more customers, while another raises the discount rate from 10% to 25% for a festive sale. Neither change conflicts on the "same line," so Git merges them without a single warning. The result: a Rs 300 order that shouldn't have qualified for any discount now gets 25% off automatically — a compounding financial bug that nobody catches until it's already cost the company money in production. Our Solution: Auxilio built a Semantic Merge Conflict Detector — a tool that reads intent, not just text. Instead of comparing raw diffs, it extracts what each branch's changes are trying to accomplish, compares those intents against each other, and flags cases where two "individually correct" changes combine into an unintended — and often costly — outcome. How It Works: The tool takes two Git branch names as input and, using the shared merge base, extracts each branch's diff. An intent-analysis module parses the changed files and functions and generates a human-readable summary of what each branch is trying to do (e.g., "lowering eligibility threshold" vs. "increasing discount rate"). A conflict-detection module then compares the two intent summaries using pattern-based heuristics — checking for cases like a modified threshold paired with a modified rate, or a changed condition paired with changed logic inside it. If a semantic conflict is found, a report generator produces a clear, color-coded terminal report showing severity (HIGH/MEDIUM/LOW), the affected files, a plain-English explanation of the conflict, and a recommendation for the developers to review before merging. Target Users: This tool is built for software engineering teams, especially fast-moving startups and mid-size dev teams working across multiple concurrent feature branches, where business-critical logic (pricing, permissions, thresholds, rate limits) is frequently touched by more than one developer in parallel. Engineering leads and reviewers can run it as a pre-merge check to catch conflicts that code review alone tends to miss. What Makes It Unique: Most merge-conflict tooling stops at syntax. We go a layer deeper by using IBM Bob's reasoning capabilities to infer developer intent from a diff — turning a purely mechanical git operation into a semantically aware safety check. It requires no live API calls at runtime, works entirely on local repos, and integrates naturally into any existing Git workflow as a lightweight CLI step before merging. Impact: By surfacing conflicts that are invisible to Git but visible to a human reviewer only after significant manual effort, Auxilio's tool prevents costly production bugs before they ship — turning a silent, expensive failure mode into a five-second warning.