Field Guide to Developer Behavior
merge-conflict martyrdom
noun/mɜːrdʒ ˈkɒnflɪkt ˈmɑːrtərdəm/
1
The performative suffering of resolving a 40-file merge conflict alone, loudly, in a shared Slack channel, instead of just asking for help.
“He’s been posting conflict-resolution screenshots in #general for an hour. Peak merge-conflict martyrdom.”