Gregory's Serverhere's a thing you can do: pepper your code with comments that contain the text "<<<<<<< HEAD" (I did not encounter this in the wild, this is just an idea I had right now)
 11 comments
 kepstin, they'd probably break those markers up into multiple strings to avoid this     |
@darius I hate this so much.