Merge Conflict

Latest Episodes:

497: Turning Machine Code into C with AI Jan 12, 2026

Show notes

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: feeding a 64KB EEPROM through a disassembler and having Sonnet decompile it into readable C, exposing a PID autopilot and hardware checks—proof that AI can accelerate reverse engineering and embedded work. Along the way they share hands-on tips (trim and clean context, use disassembly first, tweak prompts), and fun examples of AI-generated icons and AppleScript. A must-listen for devs curious how AI can supercharge real projects.

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

Support Merge Conflict

Links:

496: All The Holiday Hacks Jan 05, 2026

Show notes

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

Support Merge Conflict

Links:

495: 2025 Wrapped - The Official Year of AI Development Dec 29, 2025

Show notes

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.

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

Support Merge Conflict

494: TV Evolution- CRTs, Aspect Ratios, and Beyond Dec 22, 2025

Show notes

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!

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

Support Merge Conflict

493: Git's most powerful but underutilized tool Dec 15, 2025

Show notes

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 optimizing lighting setups, this episode is packed with insights that are both educational and entertaining, making it a must-listen for developers and creatives alike.

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

Support Merge Conflict

492: SwiftData & CloudKit Sync "Just Work" Right? [Boosted Audio] Dec 08, 2025

Show notes

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 learned from coding on planes and trains.

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

Support Merge Conflict

Links:

Test James' App

491: Gemini 3.0: AI's Leap in UI Design? Dec 01, 2025

Show notes

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 Visual Studio Code, and cutting-edge developments in robotics and virtual reality. This episode is a must-listen for anyone interested in the intersection of AI, design, and technology.

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

Support Merge Conflict

490: SwiftUI, SwiftData, Apple Intelligence, All In VS Code??!?! Nov 24, 2025

Show notes

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 that simplify complex tasks. We also delve into the benefits and challenges of using VS Code for Swift development, sharing insights on optimizing Swift projects and leveraging AI for content creation. Perfect for developers and tech enthusiasts, this episode provides actionable takeaways and thought-provoking discussions that will inspire your next project. Tune in to uncover the future of development and productivity!

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

Support Merge Conflict

Links:

Code

489: .NET 10 and Visual Studio 2026 Nov 17, 2025

Show notes

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

Support Merge Conflict

488: Breaking Down the 2025 Octoverse Report Nov 10, 2025

Show notes

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/