The B2B Podcast Index
Index
All categories
MarketingSalesSaaSFinanceHROpsLeadershipCustomer SuccessAI & DataProductStartups & FoundersRevOpsEngineering & DevTools
MethodologySubmit
Best of:MarketingSalesSaaSFinanceHROpsLeadershipCustomer SuccessAI & DataProductStartups & FoundersRevOpsEngineering & DevTools
An independent project byFame
SearchBest episodesGuestsInsightsMethodologySubmit a podcast
Index/Engineering & DevTools/The CTO Podcast with Fexingo
The CTO Podcast with Fexingo artwork

How GitHub Solved the Merge Conflict Crisis

The CTO Podcast with Fexingo · 2026-09-01 · 10 min

0:00--:--

Topics in this episode

Technical leadershipDeveloper productivitygithub merge conflictscode review best practicespull request workflow

Episode notes

GitHub faced a structural crisis in developer productivity when merge conflicts became a daily bottleneck for engineering teams. This episode examines how they redesigned their pull request workflow to reduce friction, cut context-switching costs, and improve code review velocity without sacrificing security. We look at the specific architectural changes to their CI/CD pipeline, the introduction of draft pull requests, and the subtle cultural shifts that turned conflict from a bug into a feature of collaboration. If you lead an engineering org or manage technical workflows, this is a masterclass in reducing cognitive load at scale. #EngineeringLeadership #DeveloperExperience #GitHub #MergeConflicts #CodeReview #SoftwareArchitecture #DevOpsCulture #TechnicalDebt #ProductivityTools #TeamCollaboration #CI/CD #PullRequests #FexingoBusiness #BusinessPodcast #TechTrends2026 #CTOPodcast #WorkflowOptimization #RemoteEngineering Keep every episode free: buymeacoffee.com/fexingo

Related episodes across the Index

Other episodes covering the same guests and topics, from across The B2B Podcast Index.

  • Beyond Dashboards: How AI Is Redefining Developer Productivity with Adeeb ValiullaShipTalk · on Developer productivity85 / 100
  • TL016: When It Comes To Product Design, Don’t Trust Your GutTechnically Leadership · on Technical leadership82 / 100
  • AI's unglamorous wins for developer productivity with Tara Hernandez from MongoDBEngineering Unblocked · on Developer productivity75 / 100
  • Measuring What Matters: Unlocking Engineering Productivity with AI and MetricsTech Leaders Intel · on Developer productivity65 / 100
  • Top 12 AI Code Review Agents for Engineering Velocity and QualityAgentic AI at Work: The Future of Workflow Automation · on Developer productivity41 / 100
  • Building the Future of Technical Leadership at METM with Dr. Sunshine WebsterTechnical Leadership Talks · on Technical leadership36 / 100

More from The CTO Podcast with Fexingo

All episodes →
  • How Datadog Scaled Engineering Without Burning Out82 / 100
  • How Slack Scaled Engineering Without Adding Headcount
  • How Atlassian Tamed Technical Debt With Architecture Contracts
  • How Atlassian Tamed Technical Debt With Architecture Contracts
  • How GitHub Tamed Merge Conflict Chaos
Explore the best B2B Engineering & DevTools podcasts →
All The CTO Podcast with Fexingo episodes →