This week, we talk about the similarities between dirty socks and merge conflicts, and end up with a tangible tool to prove that long-standing feature branches are bad news. It's a reaaaalllly good time.