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.

488: Breaking Down the 2025 Octoverse Report

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/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

11-10
54:41

487: Waymo Review & All The Agents from GitHub Universe 2025

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 ⭐⭐ Review Us (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

11-03
53:37

486: AI Browsers & Apple Silicon M5

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 available on http://mergeconflict.fm

10-27
36:58

485: N-2 iOS Support Policy

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

10-20
35:14

484: Designing for Liquid Glass

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-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

10-13
51:14

483: Never too late to migrate & modernize

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/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

10-06
50:04

482: 1 Day Apps

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://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

09-29
01:02:37

481: Hello iOS 26 & macOS 26 + Listener Questions Answered!

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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

09-22
54:50

480: Hello iPhone 17

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 http://mergeconflict.fm

09-15
53:20

479: All in on Spec-Driven Development

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 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

09-08
44:23

478: macOS 26... Something is wrong here...

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://mergeconflict.fm

09-01
42:06

477: From Spark, To Blazor, To Mobile, To Production in 1 Day

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: 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

08-25
59:54

476: GPT-5 Is Here, What's next?

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

08-18
46:24

475: We Built 6 Apps with GitHub Spark

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-media-insight--jamesmontemagno.github.app/ https://team-signature-colle--jamesmontemagno.github.app/ https://pet-insulin-tracker--jamesmontemagno.github.app/ https://squirrel-herder-adve--jamesmontemagno.github.app/ 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

08-11
01:10:20

474: Apple Intelligence for C# and .NET

Frank brings apple intelligence APIs to C#! We discuss! https://github.com/praeclarum/CrossIntelligence/ 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

08-04
35:40

473: The Catalyst for Frank's new Kitty!

Frank got a new cat! Let's discuss! 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

07-28
28:02

472: How I Vibe Coded a SaaS with VS Code

James has been vibe coding a full production site completely with VS Code and walks us through his steps to get to production and almost to the point of accepting money from customers! 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

07-21
59:37

471: Cracking Open VS Code AI Agent Mode Code

Frank has explored the VS Code AI Chat Agent Mode code base. We discuss. 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

07-14
55:48

470: AI Assisted Coding, .NET MAUI 10, and CarPlay for Everyone

It's lightning topic time! AI Assisted Coding, Archiving a Library, .NET MAUI XAML in .NET 10, 1 Month of Switch 2, CarPlay Live Activities, and new .NET MAUI 10 features. 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

07-07
59:28

469: New MCP Server Features

Resources, sampling, prompts, and more! 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

06-30
43:40

Amjad Chaudhry

Consistent uptime is crucial for any website. Hosting companies in Atlanta often boast uptime guarantees of 99.9%, ensuring your site remains online and accessible. https://turnuphosting.com/

01-11 Reply

Wear Mart AE

This is awesome! 🚀 Free hosting for websites and web apps is a game-changer for developers and creators. 🎉 It's incredible how many platforms offer this service, making it easier than ever to get projects online! 💻✨ #WebHosting #FreeHosting https://wearmartae.com/high-waisted-scrub-pants/

10-12 Reply

Wear Mart AE

This is awesome! 🚀 Free hosting for websites and web apps is a game-changer for developers and creators. 🎉 It's incredible how many platforms offer this service, making it easier than ever to get projects online! 💻✨ #WebHosting #FreeHosting Best Regards: We are custom manufacturer and wholesale supplier of sports wear, athletic wear, school uniforms, medical scrubs, https://wearmartae.com/ and other apparels. We are trusted by 1000+ clients worldwide.

10-12 Reply

Chris Jonson

Hosting your website or web app for free can be a game-changer, especially for small businesses or hobbyists like Frank with his drone updates. Platforms like https://www.ewebguru.com/ offer fantastic options for hosting your projects without breaking the bank. It's incredible how accessible and user-friendly these services have become, making it easier than ever to share your creations with the world. Whether it's a personal blog, a portfolio, or a small business website, having reliable hosting like eWebGuru ensures your online presence is always up and running smoothly.

05-03 Reply

Eric Reeves

This podcast was awesome. I have always had issues properly using cancellation tokens.

08-14 Reply

11-15

Recommend Channels