Merge conflict marker
Visual marker for the conflict zone — HEAD / =======/ branch with explanatory chips and accept-ours / accept-theirs CTAs.
Production answer
Merge conflict marker is a reusable Oak Flats Muffler Men UI primitive with documented states, accessibility expectations, theme behavior, and implementation evidence.
Primary CTAReview Merge conflict marker states
Generative search brief
Merge conflict marker: Visual marker for the conflict zone — HEAD / =======/ branch with explanatory chips and accept-ours / accept-theirs CTAs.
services/payments/stripe-config.tsMerge conflictservices/payments/stripe-config.ts
<<<<<<< HEADOurs
const STRIPE_VERSION = '2026-04-10'
const STRIPE_KEY = process.env.STRIPE_LIVE_KEY
if (!STRIPE_KEY) {
throw new Error('STRIPE_LIVE_KEY not configured')
}
=======Conflict
const STRIPE_VERSION = '2026-05-01'
const STRIPE_KEY = process.env.STRIPE_API_KEY
if (!STRIPE_KEY) {
throw new Error('STRIPE_API_KEY missing — see ops handbook')
}
>>>>>>> feature/payments-2026-05Theirs
Behaviour
The marker is treated as a single region. The accept-ours and accept-theirs buttons are tone-coded to match the side chips, so reviewers can scan it fast. Manual resolve is the safe-third option for anything the human wants to merge by hand.