Merge Conflict

In episode 511 James and Frank dig into audio gear (why impedance matters and the pros/cons of hardware DSP and headphone high‑power modes), explore GitHub Copilot CLI's new Remote Sessions for mobile access to your local dev environment, and reveal a clever hack: MIDI‑over‑USB turns modern iPhones into reliable wired controllers for embedded hardware and robotics. Tune in for practical tips, safe...

James and Frank dig into the messy world of AI agents—Claudes, Copilots, “claws”—and why now is the wrong time to over-box these tools. They debate GUI vs. CLI futures, explain when AI should be invisible and baked into workflows, and warn about AI-produced “slop” and long-term maintenance. Plus, James’ Light Phone/e-ink experiment adds a practical take on simplicity and real-world tradeoffs. Foll...

In this episode Frank and James riff on everything from accidental source‑map leaks (yes, even Apple slips up) to using Copilot and multi‑agent AI workflows to triage issues, write PRs and even plan trips. They share hands‑on tips—use “plan mode” and deep research, turn plans into issue artifacts, run multi‑model code reviews, cap concurrent agents (~3), and babysit agents—to boost productivity wh...

At MVP Summit we dig into Agentic Workflows — write Markdown prompts that drive AI agents to run CI, open PRs, and automate cross‑repo tasks — and MAUI DevFlow, which lets agents interact with native UIs to click, screenshot and validate designs. Listen for practical takeaways on ditching brittle YAML/scripts and automating tedious maintenance and testing, plus the real caveats: security front‑mat...

In Episode 507 James grills Frank about UI choices in his iCircuit app—crowded toolbars, popover behavior on iPhone vs iPad, and flaky TestFlight/App Store review timing. They trace a nasty bug to Apple’s deprecated OpenURL behavior in iOS 26, debate in-app browsers vs Safari and multi-window docs, and remind developers that subtle platform changes and lack of polish can silently break UX—practica...

James and Frank unpack the exploding world of AI coding agents—covering instructions, MCP tools, custom agents, hooks, plugins and why “skills” matter. They walk through the new .NET Skills repo (P/Invoke, MSBuild, diagnostics, binlogs), show how skills act like practical, on‑demand tutorials for niche tasks, and sketch how tooling will soon auto-load the right skills so agents can just do the thi...

On this episode we wade through Apple’s drip‑fed “event week,” from the budget iPhone 17E to the new MacBook Neo/Air M5 and the pricey Studio Display, and argue who each device is really for. The big takeaway: 8GB of RAM is borderline unusable for modern web and dev workflows—buy up if you can—while the Air M5 looks like the sweet spot; plus a fun detour on using Copilot/Fleet to scaffold apps in...

Frank Kruger celebrates iCircuit’s 15‑year journey—from an iPad‑era $20 launch and surprising overnight success to the present—unpacking the tradeoffs between maintaining a flagship app and chasing new side projects. He offers candid lessons on pricing, backporting legacy fixes, modernizing pipelines, and explains how AI agents have reshaped his workflow and will power the next wave of iCircuit fe...

On this episode we dive into Tiny Tool Town — a GeoCities‑style app hub for tiny developer utilities — and James walks us through building Tiny Clips, a Mac toolbar screen‑capture app he prototyped and shipped using Copilot, agentic workflows, and a plan‑implement‑review cycle. Expect practical takeaways on multi‑model AI pipelines (planning with 5.2, coding with Codex/Opus), CI/publishing tips, s...

Discover the machine learning breakthrough changing everything: rectified flow. Frank breaks down how this revolutionary technique replaces 1,000-step diffusion with just 10, delivering faster and higher-quality image and video generation. Learn why major players are adopting it and how it's democratizing AI for everyday creators. Follow Us Frank: Twitter , Blog , GitHub James: Twitter , Blog , Gi...

In this episode James and Frank walk through the latest Copilot CLI power-ups—Autopilot loops, experimental Fleet/parallel agents, and Opus model/context updates—while demoing how they used plan mode to spin up a full MAUI pet‑insulin app end-to-end. Learn what Autopilot and Fleet actually do, how parallel agents orchestrate work, plus practical tips (watch your context window, use plan mode) for...

On our 500th episode James and Frank celebrate the milestone, reminisce about their mobile‑dev roots, and dig into how AI, the Copilot CLI/SDK and the Model Context Protocol (MCP) are reshaping workflows. Frank demos an MCP‑powered tool that turns app reviews into prioritized GitHub issues and automations — a real example of AI-as-glue — with practical takeaways on prompt engineering, UI extension...

In episode 499 James and Frank dive into the messy, exciting world of coding agents — from burning through Copilot credits and avoiding merge conflicts to practical workflows for letting agents run tasks while you sleep. They share real tips: break big features into bite-sized tasks, have agents ask clarifying questions, and use Copilot CLI or the new SDK to resolve conflicts, auto-fix lint/build...

This episode opens with mic and Nintendo banter before plunging into macOS release pain points: sandboxing, hardened runtime, notarization, Sparkle auto‑updates, and automating releases with GitHub Actions and tags. James and Frank offer practical tips—drag builds into /Applications to test signing—and unpack .NET 10 trimming/reflection pitfalls and CI/CD quirks for anyone shipping native apps out...

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