Merge Conflict
Episode Archive
Episode Archive
497 episodes of Merge Conflict since the first episode, which aired on July 11th, 2016.
-
459: Red Robin's Auto Scaling Problems
April 21st, 2025 | 34 mins 40 secs
Red Robin recently rolled out a massively successful promotion for unlimited burgers for a month for $20... but with success comes huge demand... how did they scale up? What could have they have done? What should that have done?
-
A chat with Larry Osterman on Microsoft's Transformation, AI, & Interviewing
April 17th, 2025 | 13 mins 49 secs
I had the amazing opportunity to sit down with the one and only Larry Osterman during the Microsoft 50th anniversary celebration to talk about his development journey, Microsoft's leadership transformation over the year, some of his favorite stories from his time at Microsoft, and of course how AI is transforming his every day life and work.
-
-
457: Nintendo Switch 2, MCP Remote Servers, & Vibe Coding Games
April 7th, 2025 | 38 mins 21 secs
Nintendo has unveiled the Switch 2 so we discuss, more MCP, and we vibe code non stop!
-
-
455: 3D Printing for Profit
March 24th, 2025 | 30 mins 17 secs
James has a great interaction with an etsy seller who collaborated on a design that was completely 3D printed for coffee equipment. We discuss.
-
454: Let's ship some .NET iOS & Android apps! CI/CD Deep Dive
March 17th, 2025 | 44 mins 20 secs
Frank is all in on GitHub actions on his newly updated iOS & Android Apps with .NET 8 and .NET 9. Let's dive through his yaml!
-
453: All Things .NET Trimming & Native AOT
March 10th, 2025 | 45 mins 15 secs
It's time to not just AOT our apps, but make our libraries AOT compatible & trimmable so others can leverage these improvements.
-
452: Building a 2MB iOS app in Swift & Xcode
March 3rd, 2025 | 40 mins 45 secs
Frank is off building amazing things for iOS and they are tiny, but feature rich. How did Frank build his latest app to be only 2MB in Swift?
-
451: Mac mini dongles & AI?!?!
February 24th, 2025 | 36 mins 51 secs
AI, USB dongles, more AI, and more dongles? What is even going on this episode?
-
450: AI Agents, Hottest Reloading, & Apple Notes in 2025
February 17th, 2025 | 45 mins
GitHub Copilot Agent Mode is here! We talk new hot reloading capabilities, more AI in Apple Notes, and overheating our Mac minis!
-
449: Modernizing .NET Libraries
February 10th, 2025 | 32 mins 16 secs
Frank is on a journey to update all of his libraries to the latest .NET. Let's talk about why and lessons learned.
-
448: Did Android XR Just Destroy visionOS?
February 3rd, 2025 | 32 mins 29 secs
Google just previewed their new Android XR device that looks to be a complete game changer... how does this change development and what does it mean for visionOS and the Vision Pro?
-
447: Whoops, I Lost My Keystore
January 27th, 2025 | 27 mins 26 secs
What happens if you lose your Android Keystore? Do you ever get to publish you app again? We find out!
-
446: Mac mini M4 Pro - Honest Developer Reviews
January 20th, 2025 | 45 mins 45 secs
It has been several months since we got our Mac mini M4 Pro. What are our thoughts on hardware, software, and real world development.
-
445: "Live" from CES 2025
January 13th, 2025 | 43 mins 29 secs
We are going "live" from our houses to CES and picking out some of our favorite finds from the week.