
Podcast 274: Who’s afraid of a little merge conflict?
When it's been a while, and you're out of sync with your team's tools and tactics, merge conflicts can get real tricky.
The Stack Overflow podcast is a frank and funny conversation about what it means to work in software and how code is reshaping our world. As it celebrates its 12th anniversary, it’s a must listen for any programmer, as necessary as Stack Overflow itself.