The CTO Podcast with Fexingo · 2026-09-02 · 8 min
Episode 174 explores the engineering and cultural strategies behind GitHub's solution to merge conflict crises. Lucas and Luna examine how massive teams avoid codebase fragmentation, the specific tooling shifts from GitFlow to trunk-based development, and the psychological safety required for frequent integration. We look at real-world examples of automated conflict resolution and why reducing merge friction is critical for developer velocity in September 2026. #GitHub #MergeConflicts #TrunkBasedDevelopment #GitFlow #DevOps #SoftwareEngineering #TechnicalLeadership #ContinuousIntegration #CodeReview #DeveloperExperience #VersionControl #AgileMethodologies #TeamCollaboration #EngineeringCulture #FexingoBusiness #BusinessPodcast #TechNews #CTOPodcast Keep every episode free: buymeacoffee.com/fexingo
Other episodes covering the same guests and topics, from across The B2B Podcast Index.
How Datadog Scaled Engineering Without Burning Out82 / 100How Slack Scaled Engineering Without Adding HeadcountHow Atlassian Tamed Technical Debt With Architecture ContractsHow Atlassian Tamed Technical Debt With Architecture ContractsHow GitHub Solved the Merge Conflict Crisis
