526: GitHub Stacked PRs: Managing Complex Code Changes

In Episode 531 James and Frank recount a near‑disastrous data loss when local recordings died seven minutes in, forcing them to rely on Zencastr's cloud-recovery button and a hopeful rescue email. They walk through the panic and the clever fix—using GitHub Copilot CLI/Baby Luna, FFmpeg and AI-assisted workflows to rebuild a muxed video, repair audio‑video drift, and underscore lessons about testing restores and trusting backups. 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 kicks off with WinUI’s shift to open‑source‑first—what the GitHub‑centric workflow means for Windows devs—and James and Frank’s hands‑on tales modernizing apps, CI/CD, and the surprisingly smooth Microsoft Store pipeline. They then deep‑dive into Apple: M6 Mac mini and Mac Studio upgrades for local AI, Rosetta’s sunset and Intel‑Mac worries, foldable iPhone rumors, and possible Apple TV Thread/HDMI features—practical insights for choosing platforms and tooling. Note: We had issues with local recordings, so this is a cloud backup processed with Adobe Podcasts 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 update-packed episode James and Frank dive into developer tooling: the VS Code Mobile Canvas that embeds emulators into your editor, MAUI DevFlow’s rewrite enabling plain .NET/native (and desktop AppKit) support, and the growing MCP/agent ecosystem that ties editors, the Copilot app and CLI together. They share practical takeaways—Mobile Canvas works across frameworks, DevFlow supports non‑MAUI apps, agent instruction files matter, and you can automate Microsoft Store publishing—giving cross‑platform builders clear next steps. 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 528 James and Frank riff on software updates, AI-powered documentation and rapid app-building—covering a WebAssembly Oh My Posh demo, a LocalMorph/FFmpeg bridge, and MAUI-native builds—showing how AI can speed onboarding, re-theme UIs and generate CI/CD pipelines. They close with a lively debate on distribution—Homebrew vs app stores—sharing practical guidance on when to use package managers versus polished consumer releases, plus a playful detour into Frank’s FIRE calculators. 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

AI agents are revolutionizing mobile development! James and Frank explore GitHub's new Mobile Canvas extension that lets AI agents see and interact with iOS and Android apps in real-time, no matter what framework you're using. They discuss how this tool finally closes the feedback loop for native developers and break down the emerging plugin standard reshaping AI-assisted coding. Link: https://github.com/Redth/mobile-canvas-ghcp 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 deep into GitHub's biggest release in years: Stacked Pull Requests. Learn how this long-awaited feature finally solves the challenge of managing massive, complex code changes by breaking them into smaller, independently reviewable chunks while maintaining dependencies—plus discover how Merge Queues work alongside this innovation to streamline workflows in high-velocity 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

In this episode, James and Frank explore the bittersweet reality of experiencing cinema in 2026, starting with Frank's disappointing discovery that Seattle's Pacific Science Center—home to a true IMAX theater—has ditched its iconic 70mm film projection for digital laser technology. Despite Christopher Nolan's passionate advocacy for shooting on IMAX film, fewer theaters worldwide can actually deliver his intended experience, raising questions about whether premium cinema experiences are disappearing. The hosts dive deep into what made true IMAX special and the broader trend of losing analog, artisanal technologies in favor of digital convenience. Beyond cinema, the conversation spans the future of media itself: Xbox bringing 25-year-old original Xbox games to PC through emulation, the resurgence of physical media as streaming services become unreliable, and whether digital downloads or physical discs make sense anymore. Frank also showcases an incredibly impressive technical achievement—iCircuit's new Python programming support, which layers a Raspberry Pi Pico emulator atop a circuit simulator, all running in C# on your phone. It's a fascinating look at how we're preserving experiences, accessing the past, and building for the future across gaming, entertainment, and development. 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 episode 524 James and Frank dive into the new .NET MAUI developer stack—covering the MAUI CLI/Maui Doctor that auto-provisions SDKs and emulators, the Maui Sherpa GUI for device/Xcode/provisioning management, and DevFlow's MCP server that lets AI agents inspect, interact with and automatically test apps (closing the loop). They also highlight the VS Code MAUI agent/skills, profiling tools, and the shift to core CLR in .NET 11 with performance tradeoffs to watch. 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 releases UI.md, a practical markdown guide distilled from 25 years of software development that captures essential UI/UX principles to help AI (and developers) build better interfaces. The hosts dive deep into why users expect consistency, how small details create polish, and why understanding your users' mental models beats flashy design every time—with real-world examples from their own apps. 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 dig into Slate’s modular electric pickup — a $24,950, 205‑mile, no-frills truck you can customize later — and unpack how factory vs dealer options, aftermarket mods and build quality will make or break the idea. They also cover real-world charging (level 1/2/3), fleet and daily-use practicality, and why a DIY, upgradeable EV could reshape affordable vehicle ownership. 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