Skip to main content

Conflict Prediction

squirex conflict predicts merge conflicts between branches before you run git merge, analyzing Apex method signatures and SOQL dependency overlaps.

Usage​

squirex conflict -b main,feature/my-branch

Output​

Conflict Prediction: main ↔ feature/my-branch
─────────────────────────────────────────────
HIGH RISK:
  AccountController.cls :: getActiveAccounts()
    • main: returns List<Account> with 3 SOQL filters
    • feature: adds 2 additional WHERE clauses — query result incompatible

MEDIUM RISK:
  ContactService.cls :: createContact()
    • Both branches modified parameter list (different signatures)

NO CONFLICT:
  OpportunityHandler.cls — only modified in feature branch

How It Works​

SquireX parses both branches' Apex ASTs and identifies:

  1. Signature conflicts — same method, different parameter types or return types
  2. SOQL dependency conflicts — same SOQL target, diverging field lists
  3. DML target conflicts — both branches performing DML on the same SObject type in the same method