Merge Conflict

Merge Conflict

Download on the App Store

Merge Conflict episodes

  • 537: Going ULTRA with RTX Spark and New Surface Devices

    Microsoft’s new Surface Laptop Ultra pairs an ARM chip with NVIDIA RTX graphics and unified memory, promising workstation-class power for creators and local AI—at a premium price. The conversation explores why CUDA support and Windows ML matter, how local and cloud models can work together, and how Microsoft’s new container-based isolation aims to keep autonomous coding agents safer. A look at ambitious hardware and the software ecosystem needed to make it useful.

    https://blogs.windows.com/windowsexperience/2026/10/07/building-windows-for-hybrid-intelligence/

    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

      Support Merge Conflict

      58 min
    • 536: Decisions, Microsoft-Decision-1, Decisions

      This week we look at decision models, which have gone from a novelty to something every AI lab is now building. We start with a practical detour: where do you actually sell a high-end Mac mini these days? We compare local marketplaces and eBay, and the trust tradeoffs that come with each. Then we come back to decision models and explain why Jev got us interested in them again. We cover Microsoft's Decision One and what makes it notable: its benchmarks and its speed. We also walk through how decision models work in practice for games, robotics and structured control. Finally, we explain why small fine-tuned models matter for robustness, for running locally and for a future beyond chat. We wrap up with what all this means for local AI hardware and how we use OpenRouter in our workflows. Plus: a teaser for next week's Microsoft hardware discussion.

      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

        Support Merge Conflict

        Links:

        • Microsoft-Decision-1
      • openrouter-decisions
      • OpenAI Decisions
      • 40 min
      • 535: Next-Gen Siri: Disappointingly Not the Chatbot We Wanted

        James and Frank explore Apple's next-gen Siri and iOS 27 updates with mixed results—the chatbot fell short of expectations despite hype. They dive into AI agents, smart home automation potential, and why Apple's scattered AI integration lags behind competitors like OpenAI and Microsoft. Plus, practical developer updates on Xcode, .NET, and automating your digital life.

        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

          Support Merge Conflict

          47 min
        • 534: Why Developers Are Obsessed with Budget LLMs (Jev, Luna, & more)

          Discover the emerging classifier revolution with Jev—a radical new take on LLMs that ditches generation for lightning-fast categorization. Plus, deep dives into the latest model releases (Luna, GPT-6 Sol, Claude Opus 5.5), practical strategies for iterative AI development, and why specialized models are reshaping how we work with AI.

          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

            Support Merge Conflict

            41 min
          • 533: iPhone Duo Development: Navigating Dual Screens and Layouts

            Apple's new iPhone Duo promises a game-changing foldable experience, but developers face a minefield of technical challenges. James and Frank break down the critical app adaptation work required—from handling multiple screen permutations to managing safe area insets and keyboard behavior—plus why native UI controls matter more than ever. 

            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

              Support Merge Conflict

              46 min
            • 532: HydraFusion: Multi-Model Orchestration Changes Everything

              In this week's episode, James and Frank dive deep into how their approach to working with AI models has fundamentally shifted over the past few months. We explore a game-changing realization: you don't always need the most expensive, powerful model for every task. Instead, they share a strategic two-part workflow—using high-reasoning models for deep research and planning (generating comprehensive documentation and analysis), then switching to tiny, blazingly-fast models like Baby Luna or MAI Code 1.1 Flash for implementation, cutting costs by 90-95% while maintaining nearly identical results. But the real breakthrough is HydraFusion, GitHub's new multi-model orchestration runtime that automatically selects the optimal execution pattern (single model, cascade of models, or independent critique model) for each request. The hosts reveal how this technology delivers Opus-level code quality at 70% lower costs while freeing developers from the constant task of model and reasoning selection. Whether you're concerned about AI costs, frustrated with benchmarking confusion, or curious about the next evolution in AI-assisted development, this episode reveals practical strategies to work smarter with models—and introduces a technology that could reshape how developers collaborate with AI entirely.

              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

                Support Merge Conflict

                43 min
              • 531: How AI Saved Our Lost Podcast Recording

                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

                  Support Merge Conflict

                  38 min
                • 530: WinUI Goes Open Source & Mac Mini/Studio Upgrades!

                  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

                    Support Merge Conflict

                    1 hr 6 min
                  • 529: Agent, MCP, and Tooling: Taming Cross‑Platform DevFlows

                    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

                      Support Merge Conflict

                      43 min
                    • 528: Build, Ship, Repeat: AI Tools Changing App Development

                      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

                        Support Merge Conflict

                        41 min

                      About Merge Conflict

                      From the publisher's feed

                      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…

                      More shows like Merge Conflict

                      Hanselminutes with Scott Hanselman by Scott Hanselman

                      Hanselminutes with Scott Hanselman

                      380 Listeners

                      The Changelog: Software Development, Open Source by Changelog Media

                      The Changelog: Software Development, Open Source

                      286 Listeners

                      This Week in Tech (Audio) by TWiT

                      This Week in Tech (Audio)

                      3,056 Listeners

                      The Vergecast by The Verge

                      The Vergecast

                      3,712 Listeners

                      RunAs Radio by Richard Campbell

                      RunAs Radio

                      83 Listeners

                      Syntax - Tasty Web Development Treats by Wes Bos & Scott Tolinski - Full Stack JavaScript Web Developers

                      Syntax - Tasty Web Development Treats

                      985 Listeners

                      Darknet Diaries by Jack Rhysider

                      Darknet Diaries

                      8,063 Listeners

                      Practical AI by Daniel Whitenack and Chris Benson

                      Practical AI

                      207 Listeners

                      The Modern .NET Show by Jamie Taylor

                      The Modern .NET Show

                      34 Listeners

                      AI DevOps Podcast by Jeffrey Palermo

                      AI DevOps Podcast

                      23 Listeners

                      .NET Rocks! by Carl Franklin and Richard Campbell

                      .NET Rocks!

                      243 Listeners

                      People I (Mostly) Admire by Freakonomics Radio + Stitcher

                      People I (Mostly) Admire

                      2,014 Listeners

                      The Unhandled Exception Podcast by Dan Clarke (@dracan)

                      The Unhandled Exception Podcast

                      3 Listeners

                      Security This Week by Carl Franklin

                      Security This Week

                      18 Listeners

                      Latent Space: The AI Engineer Podcast by Latent.Space

                      Latent Space: The AI Engineer Podcast

                      106 Listeners