Show Notes
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 Support Merge Conflict
More from Merge Conflict
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.
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.
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.
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.
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.