Merge Conflict

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, sandboxing/TestFlight pitfalls, and why tiny apps are booming. 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

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, 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 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 turning AI agents into fast prototypes. 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

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 extensions, and when to automate versus curate manually. 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 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 failures, and automate mundane repo work. The conversation then maps the evolution from simple completions to autonomous loops like Ralph — a structured, repeatable process that generates subtasks, runs until acceptance tests pass, and updates your workflow. If you’re curious how agents, MCPs and SDKs can elevate your dev flow or spark new automations, this episode gives pragmatic examples, trade-offs, and inspiration to start experimenting today. 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

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 outside the App Store. 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 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. 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

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

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

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

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

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

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

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