I messed up a @NetNewsWire merge recently. I left some Git merge conflict markers in a couple files. @danielpunkass suggested that a pre-commit Git Hook could prevent this in the future. So I made one.. Daniel has added this to his global Git templates. You should too.