How GitHub Solved the Merge Conflict Crisis

GitHub’s engineering organization faced a silent crisis in early 2025: merge conflicts were not just slowing down deployments, they were eroding developer trust. Lucas and Luna explore how the platform moved from chaotic pull requests to a disciplined trunk-based development model with automated conflict resolution. We break down the specific tooling changes, the cultural shift required to stop treating merges as manual artistry, and the measurable impact on cycle time. If you’re leading an engineering team or building complex systems, this is the playbook for reducing friction without sacrificing quality.

#FexingoBusiness #BusinessPodcast #EngineeringLeadership #TrunkBasedDevelopment #MergeConflicts #DeveloperExperience #SoftwareArchitecture #TechManagement #GitWorkflow #CodeReview #ContinuousIntegration #DeploymentFriction #EngineeringCulture #PlatformEngineering #DevOps #TechnicalDebt #TeamCollaboration #GitHub

Keep every episode free: buymeacoffee.com/fexingo