Oct 1, 2020 · Podcast · The Stack Overflow Podcast Podcast 274: Who's afraid of a little merge conflict? [Listen]