Merge Conflict

Updated: 15 Dec 2025 • 501 episodes
www.mergeconflict.fm

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.

Keywords:

Show episodes

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, explain

55 min
00:00
55:53
No file found

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, J

51 min
00:00
51:18
No file found

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 prog

50 min
00:00
50:56
No file found

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 too

64 min
00:00
01:04:58
No file found

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://mergeconf

73 min
00:00
01:13:29
No file found

In this year’s Octoverse, we uncover how AI, agents, and typed languages are driving the biggest shifts in software development in more than a decade. Report: https://octoverse.github.com/ Follow Us Frank: Twitter, Blog, GitHub James: Twitter, Blog, GitHub Merge Conflict: Twitter, Facebook, Website, Chat on Discord Mus

54 min
00:00
54:41
No file found