Merge Conflict
Episode Archive
Episode Archive
446 episodes of Merge Conflict since the first episode, which aired on July 11th, 2016.
-
441: AI Driven Development
December 16th, 2024 | 31 mins 19 secs
Start with AI first is James' new plan for just about everything he does. We discuss some wins we have had recently with infusing AI into our workstream.
-
440: Future of GPTs? Mac Desktops? Headphones?
December 9th, 2024 | 49 mins 43 secs
We are tackling some lightning topics this week on some of our favorite things from the year. Where is AI going? Should you have multiple machines, is cloud computing the future, and how about new headphones that you can use to still hear the world around you.
-
439: One Month with the M4 Mac Mini - Developer Setup Breakdown
December 2nd, 2024 | 1 hr 5 mins
It's been nearly a month since we got our Mac Mini M4 machines. How did the setup good, what went well, what didn't and how are we feeling about our $3K purchase?
-
438: Jon Galloway - From Submarine Office to Software Developer
November 25th, 2024 | 47 mins 42 secs
James sits down with Jon Galloway to talk about his journey from submarine office to software developer and community advocate.
-
-
436: We bought new Mac minis! Now what?
November 11th, 2024 | 52 mins 18 secs
That's right we BOTH bought new mac minis! What configuration? Why did we do it? And we answer your questions!
-
435: GitHub Universe Recap + M4 is here with a NEW Mac mini!!!
November 4th, 2024 | 44 mins 21 secs
Awesome new features for GitHub Copilit and Apple surprises us with new devices and the M4!
-
434: Free OSS Controls for Everyone!
October 28th, 2024 | 38 mins 54 secs
Syncfusion starts to contribute directly to .NET MAUI source code and also open sources 14 free controls for developers! We discuss.
-
433: Epic vs Google
October 21st, 2024 | 38 mins 58 secs
Google may have to make substantial changes to the Google Play store. What does this mean for app developers? We break it down.
-
432: Creating our own color space?!?!?
October 14th, 2024 | 42 mins 23 secs
-
431: Put some Python in your C# with CSnakes
October 7th, 2024 | 37 mins 54 secs
Have you ever wanted to use some Python in your C# apps, but were stuck and had to spin up a web api to handle it? Not any more with CSnakes! Let's talk.
-
430: iOS 18 & Apple Intelligence Preview Hands-On
September 30th, 2024 | 53 mins 16 secs
Frank makes the upgrade to iOS 18.1 to test out Apple Intelligence. Are the early day's of Apple AI any good? We find out....
-
429: Hands-on with iPhone 16 Pro... Apple Intelligence Coming Soon
September 23rd, 2024 | 46 mins 4 secs
We go hands-on with the new iPhone 16 Pro! That is right, Frank got it on release day and is a major upgrade from his previous device. How does it feel, how is the software, and what is the state of AI?
-
428: Our Favorite VS Code Extensions
September 16th, 2024 | 34 mins 41 secs
We take a look at some of our favorite VS Code extensions including C# Dev Kit updates, Remote SSH, iOS and Android Archiver, and more!
-
427: It's Glowtime! Rumor Edition
September 9th, 2024 | 28 mins 53 secs
We break the latest rumors before today's big Apple event and pretend we were there and buying all the Apple goodies!
-
426: Designing, Developing, Testing, & Productizing a Board Game with Ben Ruiz
September 2nd, 2024 | 54 mins 38 secs
James sits down with his good friend Ben to talk about how he designed, developed, tested, and fully productized his new board game Age of Angra. We go deep into what the process is like, how it compares to video game development, and of course all about Age of Angra!