Merge Conflict

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

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
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
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
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
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
August 4, 2025 35 mins
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...
Mark as Played
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
Mark as Played
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/id113...
Mark as Played
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
Mark as Played
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&...
Mark as Played
June 30, 2025 43 mins
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
Mark as Played

Popular Podcasts

    I’m Jay Shetty host of On Purpose the worlds #1 Mental Health podcast and I’m so grateful you found us. I started this podcast 5 years ago to invite you into conversations and workshops that are designed to help make you happier, healthier and more healed. I believe that when you (yes you) feel seen, heard and understood you’re able to deal with relationship struggles, work challenges and life’s ups and downs with more ease and grace. I interview experts, celebrities, thought leaders and athletes so that we can grow our mindset, build better habits and uncover a side of them we’ve never seen before. New episodes every Monday and Friday. Your support means the world to me and I don’t take it for granted — click the follow button and leave a review to help us spread the love with On Purpose. I can’t wait for you to listen to your first or 500th episode!

    Ruthie's Table 4

    For more than 30 years The River Cafe in London, has been the home-from-home of artists, architects, designers, actors, collectors, writers, activists, and politicians. Michael Caine, Glenn Close, JJ Abrams, Steve McQueen, Victoria and David Beckham, and Lily Allen, are just some of the people who love to call The River Cafe home. On River Cafe Table 4, Rogers sits down with her customers—who have become friends—to talk about food memories. Table 4 explores how food impacts every aspect of our lives. “Foods is politics, food is cultural, food is how you express love, food is about your heritage, it defines who you and who you want to be,” says Rogers. Each week, Rogers invites her guest to reminisce about family suppers and first dates, what they cook, how they eat when performing, the restaurants they choose, and what food they seek when they need comfort. And to punctuate each episode of Table 4, guests such as Ralph Fiennes, Emily Blunt, and Alfonso Cuarón, read their favourite recipe from one of the best-selling River Cafe cookbooks. Table 4 itself, is situated near The River Cafe’s open kitchen, close to the bright pink wood-fired oven and next to the glossy yellow pass, where Ruthie oversees the restaurant. You are invited to take a seat at this intimate table and join the conversation. For more information, recipes, and ingredients, go to https://shoptherivercafe.co.uk/ Web: https://rivercafe.co.uk/ Instagram: www.instagram.com/therivercafelondon/ Facebook: https://en-gb.facebook.com/therivercafelondon/ For more podcasts from iHeartRadio, visit the iheartradio app, apple podcasts, or wherever you listen to your favorite shows. Learn more about your ad-choices at https://www.iheartpodcastnetwork.com

    The Joe Rogan Experience

    The official podcast of comedian Joe Rogan.

    The Breakfast Club

    The World's Most Dangerous Morning Show, The Breakfast Club, With DJ Envy, Jess Hilarious, And Charlamagne Tha God!

    Stuff You Should Know

    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.

Advertise With Us
Music, radio and podcasts, all free. Listen online or download the iHeart App.

Connect

© 2025 iHeartMedia, Inc.