Merge Conflict

In this episode James and Frank dive into the practical realities of using AI in everyday development—arguing that AI shines in brownfield (existing) code because it respects your architecture, while greenfield work rewards iterative prompting. They unpack model quirks: context-window limits, hallucinations, and why trying different models matters. The heart of the show is Frank’s nerdy delight: f...

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

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

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

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

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, Healt...

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

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

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

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 ⭐⭐ Machine...

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

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

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

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 ⭐⭐ Ma...

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 ⭐⭐ Machine...

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

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

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

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

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

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/m...

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

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

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

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