The Stack Overflow Podcast

Who's afraid of a little merge conflict?

Today's episode was inspired by a question on folks who postpone a merge for fear of being the one to resolve a conflict. Shout out to Candied Orange for the thoughtful answer. Paul and Sara reminisce about the days before Git, when version control was very different from what it is today, and Paul accidentally left many a project in shambles. Do you…