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

December 29, 2025 84 mins
James and Frank unwrap 2025 as the Year of AI Development, covering new models, the rise of agents, and editor integrations like Copilot in VS Code that changed how developers write and maintain code. You’ll hear practical takeaways—how next-edit, local models, RAG/vectorization and app‑on‑demand sped prototyping, slashed maintenance time, and why the hosts think the AI boom has legs into 2026 despite looming uncertainty. Follow Us...
Mark as Played
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
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
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
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
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

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.

    Dateline NBC

    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

    The Burden

    The Burden is a documentary series that takes listeners into the hidden places where justice is done (and undone). It dives deep into the lives of heroes and villains. And it focuses a spotlight on those who triumph even when the odds are against them. Season 5 - The Burden: Death & Deceit in Alliance On April Fools Day 1999, 26-year-old Yvonne Layne was found murdered in her Alliance, Ohio home. David Thorne, her ex-boyfriend and father of one of her children, was instantly a suspect. Another young man admitted to the murder, and David breathed a sigh of relief, until the confessed murderer fingered David; “He paid me to do it.” David was sentenced to life without parole. Two decades later, Pulitzer winner and podcast host, Maggie Freleng (Bone Valley Season 3: Graves County, Wrongful Conviction, Suave) launched a “live” investigation into David's conviction alongside Jason Baldwin (himself wrongfully convicted as a member of the West Memphis Three). Maggie had come to believe that the entire investigation of David was botched by the tiny local police department, or worse, covered up the real killer. Was Maggie correct? Was David’s claim of innocence credible? In Death and Deceit in Alliance, Maggie recounts the case that launched her career, and ultimately, “broke” her.” The results will shock the listener and reduce Maggie to tears and self-doubt. This is not your typical wrongful conviction story. In fact, it turns the genre on its head. It asks the question: What if our champions are foolish? Season 4 - The Burden: Get the Money and Run “Trying to murder my father, this was the thing that put me on the path.” That’s Joe Loya and that path was bank robbery. Bank, bank, bank, bank, bank. In season 4 of The Burden: Get the Money and Run, we hear from Joe who was once the most prolific bank robber in Southern California, and beyond. He used disguises, body doubles, proxies. He leaped over counters, grabbed the money and ran. Even as the FBI was closing in. It was a showdown between a daring bank robber, and a patient FBI agent. Joe was no ordinary bank robber. He was bright, articulate, charismatic, and driven by a dark rage that he summoned up at will. In seven episodes, Joe tells all: the what, the how… and the why. Including why he tried to murder his father. Season 3 - The Burden: Avenger Miriam Lewin is one of Argentina’s leading journalists today. At 19 years old, she was kidnapped off the streets of Buenos Aires for her political activism and thrown into a concentration camp. Thousands of her fellow inmates were executed, tossed alive from a cargo plane into the ocean. Miriam, along with a handful of others, will survive the camp. Then as a journalist, she will wage a decades long campaign to bring her tormentors to justice. Avenger is about one woman’s triumphant battle against unbelievable odds to survive torture, claim justice for the crimes done against her and others like her, and change the future of her country. Season 2 - The Burden: Empire on Blood Empire on Blood is set in the Bronx, NY, in the early 90s, when two young drug dealers ruled an intersection known as “The Corner on Blood.” The boss, Calvin Buari, lived large. He and a protege swore they would build an empire on blood. Then the relationship frayed and the protege accused Calvin of a double homicide which he claimed he didn’t do. But did he? Award-winning journalist Steve Fishman spent seven years to answer that question. This is the story of one man’s last chance to overturn his life sentence. He may prevail, but someone’s gotta pay. The Burden: Empire on Blood is the director’s cut of the true crime classic which reached #1 on the charts when it was first released half a dozen years ago. Season 1 - The Burden In the 1990s, Detective Louis N. Scarcella was legendary. In a city overrun by violent crime, he cracked the toughest cases and put away the worst criminals. “The Hulk” was his nickname. Then the story changed. Scarcella ran into a group of convicted murderers who all say they are innocent. They turned themselves into jailhouse-lawyers and in prison founded a lway firm. When they realized Scarcella helped put many of them away, they set their sights on taking him down. And with the help of a NY Times reporter they have a chance. For years, Scarcella insisted he did nothing wrong. But that’s all he’d say. Until we tracked Scarcella to a sauna in a Russian bathhouse, where he started to talk..and talk and talk. “The guilty have gone free,” he whispered. And then agreed to take us into the belly of the beast. Welcome to The Burden.

    SmartLess

    "SmartLess" with Jason Bateman, Sean Hayes, & Will Arnett is a podcast that connects and unites people from all walks of life to learn about shared experiences through thoughtful dialogue and organic hilarity. A nice surprise: in each episode of SmartLess, one of the hosts reveals his mystery guest to the other two. What ensues is a genuinely improvised and authentic conversation filled with laughter and newfound knowledge to feed the SmartLess mind. Subscribe to SiriusXM Podcasts+ to listen to new episodes of SmartLess ad-free and a whole week early. Start a free trial now on Apple Podcasts or by visiting siriusxm.com/podcastsplus.

    The Breakfast Club

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

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

Connect

© 2026 iHeartMedia, Inc.