Merge Conflict
Merge Conflict is a weekly discussion with Frank and James on all things development, technology, & more. After years of being friends, Frank and James finally decided to sit down and start a podcast about their lives as mobile developers using C#, Xamarin, and .NET MAUI. Much more than just another mobile development podcast, Merge Conflict, reaches all areas of development including desktop, server, and of course mobile. They also cover fun things happening in the world of technology and gaming and whatever else happens to be on Frank's and James' minds.
Episodes
December 22, 2025 • 30 mins
Dive into the fascinating world of CRT technology in this episode of How CRTs Work! Discover how these iconic monitors influenced video playback and gaming, from interlaced scanning to the art of synchronization. Learn about the unique challenges of emulating CRT effects today and the lasting legacy of these early technologies. Perfect for retro tech enthusiasts and curious minds alike!
Follow Us
Frank: Twitter, Blog, GitHub
James...
Mark as Played
December 15, 2025 • 55 mins
In this episode of 'Merge Conflict,' James and Frank dive into the intricacies of Git work trees, exploring how they revolutionize local machine development by allowing developers to manage multiple branches simultaneously. Frank initially struggles to grasp the concept, but James breaks down the functionality, explaining how work trees enable parallel branching and commit management. From managing complex code branches to optimizi...
Mark as Played
December 8, 2025 • 51 mins
James and Frank break tradition by recording Merge Conflict together in person, sharing laughs about ferries, sea shanties, and their annual Seattle holiday meetup. The conversation dives deep into Swift Data versus Core Data, CloudKit syncing, and the quirks of building modern apps with AI assistance. Along the way, James reveals his new weight‑tracking app experiment, complete with charts, HealthKit integration, and lessons learn...
Mark as Played
December 1, 2025 • 50 mins
Join us as James and Frank delve into the fascinating world of AI-driven UI design with Gemini 3.0, exploring its creative capabilities and potential to revolutionize aesthetics. Discover the latest AI model advancements, including GPT-5.1 and Codex, and gain insights into real-time trace debugging and distributed programming. Plus, we tackle the evolving landscape of Integrated Development Environments, AI tool integrations in Vis...
Mark as Played
November 24, 2025 • 64 mins
Dive into the dynamic world of SwiftUI, SwiftData, and Apple Intelligence in this episode, where we explore how these technologies are transforming development. Join us as we discuss Frank Kruger's innovative work on the Clean Room application, which showcases the elegance of macOS UI design. Discover how AI-driven tools like Apple Intelligence can enhance your Mac's capabilities, offering powerful APIs and translation features tha...
Mark as Played
November 17, 2025 • 73 mins
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐
Machine transcription available on http://mergeconflict.fm
Mark as Played
November 10, 2025 • 54 mins
In this year’s Octoverse, we uncover how AI, agents, and typed languages are driving the biggest shifts in software development in more than a decade.
Report: https://octoverse.github.com/
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/i...
Mark as Played
November 3, 2025 • 53 mins
James heads to San Francisco for this year's GitHub Universe and experience his first Waymo! After a quick review we break down all of the new developer goodies from Universe including new updates to VS Code, Agent HQ, and Copilot integrations everywhere!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface...
Mark as Played
October 27, 2025 • 36 mins
Let's talk ChatGPT Atlas and the broader AI browser space. We also look into the new Vision Pro with a M5 processor! Time to upgrade?
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐
Machine transcription availab...
Mark as Played
October 20, 2025 • 35 mins
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐
Machine transcription available on http://mergeconflict.fm
Mark as Played
October 13, 2025 • 51 mins
We are all in on macOS 26 and iOS 26 which means it is all liquid glass. But how do you actually design for it? What compromises do you have to make and how do you test backwards compatibility?
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-confl...
Mark as Played
October 6, 2025 • 50 mins
It's true, you can migrate and modernize your app at any stage... but it is really important when you can no longer ship app updates because you really need to update to newer frameworks!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id...
Mark as Played
September 29, 2025 • 62 mins
Frank and James set out to build some fun new apps in under a day.
Hotkey Typer - https://github.com/jamesmontemagno/app-hotkeytyper
Pupillary Distance Ruler - https://apps.apple.com/us/app/pupillary-distance-ruler/id6752308010
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itune...
Mark as Played
September 22, 2025 • 54 mins
We give our hands on impression of the latest iOS 26 and macOS 26 and how it has impacted our recent development of software. We also re diving through the listener bag of questions and answering as many as we can on a plethora of topics.
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (ht...
Mark as Played
September 15, 2025 • 53 mins
New iPhone, Apple Watch, AirPod pro, and also the official release of iOS 26, macOS 26, and so much more. We break it all down.
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐
Machine transcription available on ...
Mark as Played
September 8, 2025 • 44 mins
We discuss what spec-driven development is and a new toolkit from GitHub that seeks to streamline the approach when using AI.
Links:
Blog: https://github.blog/ai-and-ml/generative-ai/spec-driven-development-with-ai-get-started-with-a-new-open-source-toolkit/
GitHub: https://github.com/github/spec-kit
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Mu...
Mark as Played
September 1, 2025 • 42 mins
Frank has the latest macOS 26 betas... and something is off. We discuss what is happening and if there is hope.
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐
Machine transcription available on http://mergeconf...
Mark as Played
August 25, 2025 • 59 mins
James went from GitHub Spark prototype, to a full Blazor static web apps, and then converted into a Hybrid app with .NET MAUI and Blazor, and automated builds and deployments to TestFlight all in 1 day. We discuss in all the details of the good, bad, and way too difficult.
Link:
- My Score Keeper: https://github.com/jamesmontemagno/blazor-scorekeeper
- Frank's Post: https://praeclarum.org/2025/08/19/maui-cicd.html
Follow Us
Frank:...
Mark as Played
August 18, 2025 • 46 mins
OpenAI has unleased GPT-5 to the world, what is our take, and what is next?
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐
Machine transcription available on http://mergeconflict.fm
Mark as Played
August 11, 2025 • 70 mins
We took GitHub Spark for a spin to build apps in minute and publish them out to the world! In just a few hours we created 6 apps! What was the experience, what was the good, what was the bad, and how are we going ot use this in the future?
Links:
https://github.com/spark
https://ocean-trade-navigato--praeclarum.github.app
https://calca-share--praeclarum.github.app
https://urdf-robot-builder--praeclarum.github.app
https://social-med...
Mark as Played
Popular Podcasts
If you've ever wanted to know about champagne, satanism, the Stonewall Uprising, chaos theory, LSD, El Nino, true crime and Rosa Parks, then look no further. Josh and Chuck have you covered.
Current and classic episodes, featuring compelling true-crime mysteries, powerful documentaries and in-depth investigations. Follow now to get the latest episodes of Dateline NBC completely free, or subscribe to Dateline Premium for ad-free listening and exclusive bonus content: DatelinePremium.com
Listen to 'The Bobby Bones Show' by downloading the daily full replay.
The official podcast of comedian Joe Rogan.
Betrayal Weekly is back for a brand new season. Every Thursday, Betrayal Weekly shares first-hand accounts of broken trust, shocking deceptions, and the trail of destruction they leave behind. Hosted by Andrea Gunning, this weekly ongoing series digs into real-life stories of betrayal and the aftermath. From stories of double lives to dark discoveries, these are cautionary tales and accounts of resilience against all odds. From the producers of the critically acclaimed Betrayal series, Betrayal Weekly drops new episodes every Thursday. Please join our Substack for additional exclusive content, curated book recommendations and community discussions. Sign up FREE by clicking this link Beyond Betrayal Substack. Join our community dedicated to truth, resilience and healing. Your voice matters! Be a part of our Betrayal journey on Substack. And make sure to check out Seasons 1-4 of Betrayal, along with Betrayal Weekly Season 1.