Merge Conflict

James and Frank unpack AI-driven development shifts—agent SDKs, session management, and the rise of agent-first UIs like Google’s anti-gravity and GitHub Copilot—showing how VS Code’s Agents window, worktrees, sub-sessions and tunnels help manage multi-repo cloud and local workflows. They share practical takeaways—why SDKs are essential, when to stay code-first, how subsessions and remote tunnels protect your machine, and what to watch for in sandboxing and integration gaps.

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 share thrift‑store monitor triumphs (and a retro Wii audio nightmare) before diving into a no‑nonsense guide to buying displays: what ports, VESA mounts, and speakers really matter. They demystify HDR, mini‑LED vs OLED, refresh‑rate math (why 40/120Hz divides matter), and modern upscaling—plus the surprising developer headaches of getting HDR to actually work. Practical tips and geeky fun for anyone shopping or building.

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 running AI coding models locally versus in the cloud—BYOK/Open Router, VS Code’s chat/agent harness, model runners (Olama, vLLM), and the practicality of 27B models on a 3090 using 4‑bit quantization. They share hands-on takeaways—how recent engineering (MT/MTPLX) boosts inference to usable token rates, when auto model selection makes sense, cost and hardware trade‑offs, and why local models can liberate your workflow while still needing smarter, unified tooling.

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 explore the future of developer workflows powered by AI agents, revealing how developers are shifting from coders to testers and product strategists. They dive into new research-planning-implementation cycles, GitHub's usage-based pricing changes, and why developers must think strategically about model choices and token costs. Plus, reflections on Apple's leadership transition and the need for bold hardware innovation.

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

After a quick round of Apple dev updates, James and Frank dive into Matter — why Frank went from skeptic to devotee and why it’s poised to fix IoT chaos. They break down how Matter (an app-layer protocol running over Wi‑Fi/IPv6) and Thread (an open mesh transport) simplify secure onboarding with QR/Bluetooth, enable true interoperability across Apple/Google/Amazon, and make DIY devices easy to build and integrate.

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