R.I.P.
<<<<<<< HEAD in production
–
“Both versions were right. Neither survived.”
Death certificate
- Status
- 🪦 Buried
- Cause of death
- Merge conflictTwo changes met on the same line, and neither backed down.
- Severity
- Critical
- Hours to kill
- 1 hour
- Killed by
- Jashanpreet
- Language
- TypeScript
- Born
- 3 Nov 2025
- Fix merged
- 4 Nov 2025
- Buried
- 12 Nov 2025
- Component
- deploy
- Symptoms
- The homepage shipped with '<<<<<<< HEAD' and both versions of the header.
- The fix
- Resolved the conflict and added a CI check for conflict markers.
Timeline
Every life of this bug, oldest first.
Born as “<<<<<<< HEAD in production”3 Nov 2025
Fix merged4 Nov 2025
Buried12 Nov 2025