My favorite was resolving merge conflicts: type “a y” to accept your version of the diff, “a t” to accept their version of the diff, or “a j” to accept Jeff Dea

My favorite was resolving merge conflicts: type “a y” to accept your version of the diff, “a t” to accept their version of the diff, or “a j” to accept Jeff Dean’s version of the diff. I think another asserted that Jeff Dean can parse HTML with regular expressions.