How GitHub Tamed Merge Conflict Chaos
Fexingo... · 7:41 · 7,538 plays
Mula sa album The CTO Podcast with Fexingo: Technical Leadership, Architecture, and Engineering Org
Paglalarawan
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
More By Fexingo...
- 1
The Itneg Revolution: Igorot Resistance in the Cordillera — Fexingo History
Fexingo... · 6,693 plays · 7:12
- 2
The Great Tragedy of Pakistan's First Prime Minister
Fexingo... · 9,366 plays · 8:25
- 3
Apple's Health Data API for Third-Party Apps
Fexingo... · 8,277 plays · 7:28
- 4
The 1977 Election Crisis and Zia's Martial Law
Fexingo... · 9,217 plays · 7:12
- 5
Arabic Possessive - His and Her - Learn Arabic with Fexingo
Fexingo... · 8,524 plays · 4:12
- 6
How Meta Ads Use Offline Conversions To Close The Loop
Fexingo... · 5,545 plays · 9:20
- 7
The 1639 Sangley Uprising: Chinese Revolt in Colonial Manila — Fexingo History
Fexingo... · 9,907 plays · 6:31
- 8
The Rana Family and the Making of Modern Pakistan
Fexingo... · 2,982 plays · 6:51
- 9
How Apple's On-Device AI Could Change the Way We Type
Fexingo... · 5,024 plays · 12:42
- 10
Arabic Transport Words - Car and Bus - Learn Arabic with Fexingo
Fexingo... · 3,461 plays · 5:00
Baka Magustuhan Mo Rin
- 1
AlbumDanny Farrant Radio
4,791 plays
- 2
AlbumAn Arranged Marriage With the Disabled Billionaire
6,722 plays
- 3
AlbumJam Jum Radio
4,781 plays
- 4
AlbumWelcome to the Broken Hearts Club
8,287 plays
- 5
AlbumCharles Berthoud
Charles Berthoud · 7,877 plays
- 6
AlbumHouse of Wolves
House of Wolves · 174 plays
- 7
AlbumPatrick Junior
5,564 plays
- 8
AlbumDroppsten
3,122 plays
- 9
AlbumSin Cos Tan Radio
4,170 plays
- 10
Album20 Small Group Bible Studies
8,399 plays
- 11
Albumwhats left?
174 plays
- 12
Albumfanclubwallet Radio
5,655 plays