Merge Conflict-logo

Merge Conflict

Technology Podcasts

Merge Conflict is a weekly discussion with Frank and James on all things development, technology, & more. After years of being friends, Frank and James finally decided to sit down and start a podcast about their lives as mobile developers using C#,...

Location:

United States

Description:

Merge Conflict is a weekly discussion with Frank and James on all things development, technology, & more. After years of being friends, Frank and James finally decided to sit down and start a podcast about their lives as mobile developers using C#, Xamarin, and .NET MAUI. Much more than just another mobile development podcast, Merge Conflict, reaches all areas of development including desktop, server, and of course mobile. They also cover fun things happening in the world of technology and gaming and whatever else happens to be on Frank's and James' minds.

Language:

English

Contact:

6024926689


Episodes
Ask host to enable sharing for playback control

509: How AI Fleets Fixed 31 Issues in Two Days

4/6/2026
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 while avoiding chaos and burnout. Follow Us TwitterBlogGitHubTwitterBlogGitHubTwitterFacebookWebsiteChat on DiscordAdventureface ⭐⭐ Review Us ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:42:11

Ask host to enable sharing for playback control

508: Agentic Workflows - Markdown Automation for GitHub Actions

3/30/2026
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‑matter, a compile/lock step and token costs. Follow Us TwitterBlogGitHubTwitterBlogGitHubTwitterFacebookWebsiteChat on DiscordAdventureface ⭐⭐ Review Us ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:40:16

Ask host to enable sharing for playback control

507: iCircuit UI Roast: Toolbar, Popovers, and Polish

3/23/2026
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—practical lessons for shipping mobile apps. Follow Us TwitterBlogGitHubTwitterBlogGitHubTwitterFacebookWebsiteChat on DiscordAdventureface ⭐⭐ Review Us ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:43:18

Ask host to enable sharing for playback control

506: We have no skills

3/16/2026
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 thing for you. Follow Us TwitterBlogGitHubTwitterBlogGitHubTwitterFacebookWebsiteChat on DiscordAdventureface ⭐⭐ Review Us ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:52:59

Ask host to enable sharing for playback control

505: 8GB of RAM Isn't Good Enough #MacBookNeo

3/9/2026
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 minutes. Follow Us TwitterBlogGitHubTwitterBlogGitHubTwitterFacebookWebsiteChat on DiscordAdventureface ⭐⭐ Review Us ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:01:03:59

Ask host to enable sharing for playback control

504: 15 Years of iCircuit

3/2/2026
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 features. Follow Us TwitterBlogGitHubTwitterBlogGitHubTwitterFacebookWebsiteChat on DiscordAdventureface ⭐⭐ Review Us ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:49:26

Ask host to enable sharing for playback control

503: Welcome to Tiny Tool Town

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

Duration:00:47:49

Ask host to enable sharing for playback control

502: Rectified Flow Revolution - AI Image Generation Gets Smarter

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

Duration:00:48:55

Ask host to enable sharing for playback control

501: Autopilot, Fleets, and Parallel Agents Explained

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

Duration:00:35:57

Ask host to enable sharing for playback control

500: How Frank Builds Apps Has Changed Forever

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

Duration:00:54:43

Ask host to enable sharing for playback control

499: Going Full Ralph, CLI, & GitHub Copilot SDK?!?!

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

Duration:00:48:41

Ask host to enable sharing for playback control

498: CI/CD fro Mac Apps: GitHub Actions to Notarize

1/19/2026
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:38:47

Ask host to enable sharing for playback control

497: Turning Machine Code into C with AI

1/12/2026
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:51:09

Ask host to enable sharing for playback control

496: All The Holiday Hacks

1/5/2026
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:01:12:35

Ask host to enable sharing for playback control

495: 2025 Wrapped - The Official Year of AI Development

12/29/2025
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:01:24:35

Ask host to enable sharing for playback control

494: TV Evolution- CRTs, Aspect Ratios, and Beyond

12/22/2025
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:30:41

Ask host to enable sharing for playback control

493: Git's most powerful but underutilized tool

12/15/2025
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:55:53

Ask host to enable sharing for playback control

492: SwiftData & CloudKit Sync "Just Work" Right?

12/8/2025
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:51:18

Ask host to enable sharing for playback control

491: Gemini 3.0: AI's Leap in UI Design?

12/1/2025
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:00:50:56

Ask host to enable sharing for playback control

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

11/24/2025
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 (https://itunes.apple.com/us/podcast/merge-conflict/id1133064277?mt=2&ls=1) ⭐⭐ Machine transcription available on http://mergeconflict.fm

Duration:01:04:58