Who's afraid of a little merge conflict?

This week on the podcast, we talk about folks who like to create their own sandbox to cause and then fix merge conflicts. Better than breaking prod in front of the whole team I suppose?