## Summary 28M push events per quarter means constant concurrent collaboration; manual conflict resolution is slow and error-prone. This trigger fires at the Create stage when a merge conflict is detected, enabling automated conflict analysis and resolution proposals. **Audit Event Name:** `merge_request_conflict` --- ## Agent Examples ### Agent 1 — Conflict Context Agent Traces who made changes and why by reading the MR, diffs, and commit history, then posts a plain-English conflict summary as a comment. **Tools:** - Get Merge Request - List Merge Request Diffs - List Commits - Get Commit Diff - Create Merge Request Note ### Agent 2 — Conflict Resolution Proposal Agent Reads both the current and target branch versions of conflicting files and proposes a merged resolution for human approval. **Tools:** - Get Merge Request - Get Repository File - Get Commit Diff - Edit File - Create Merge Request Note --- ## Implementation Notes & Caveats > ⚠️ **No audit event for merge conflict state.** This fires when `merge_status` changes to `cannot_be_merged` in the webhook system. Needs to be confirmed or added via [gitlab-com/content-sites/handbook!18106](https://gitlab.com/gitlab-com/content-sites/handbook/-/merge_requests/18106).