The Order of the Merge Conflict

When two developers change the same line, someone has to sit down and decide whose reality wins.

Award it to someone today. Your own email app sends it.

Choose a format Metal challenge coin Coming soon 1.75" antique-bronze coin with a 3D high-relief front, raised rim lettering and a beaded edge. Ships in a clear capsule with a backing card. Plastic challenge coin Coming soon 1.75" soft PVC (rubber) coin with 2-3 levels of relief, painted in antique-bronze tones. Lighter and lower-cost than metal. Ships in a clear capsule with a backing card.Available once the artwork is finished. Die-cut vinyl sticker Coming soon 3" die-cut vinyl sticker of the coin artwork with a UV- and water-resistant laminate. Laptop and water-bottle grade.Available once the artwork is finished.

Physical coins and stickers are coming soon. Until then, you can email this coin for free.

Meaning

When two developers change the same line, someone has to sit down and decide whose reality wins.

Design

Front (Obverse)

Top rim: THE ORDER OF THE MERGE CONFLICT
Bottom rim: RESOLUTION DIVISION
Center: Two armored knights joust head-on across a narrow bridge. Each lance carries a pennant, one reading <<<<<<< HEAD and the other >>>>>>> main. The bridge planks between them are marked =======.

Back (Reverse)

Two clasped gauntlets in a handshake over a single line of code, inscribed "ACCEPT BOTH CHANGES".

Finish & Style

Antique bronze challenge coin, ~1.75" diameter, high-relief center scene, raised rim lettering, beaded outer edge. Matches the existing ITChallengeCoins series.

How to Earn It

Resolve a merge conflict touching 10+ files, or one that took more than an hour.
Or resolve a conflict in code you didn't write, without breaking either side's feature.
Or untangle a branch that drifted more than 100 commits behind main.

Citation

For standing between two branches and bringing peace to the line they both claimed.