Merge Conflict
Episode Archive
Episode Archive
451 episodes of Merge Conflict since the first episode, which aired on July 11th, 2016.
-
319: ML Cuneiform Translations
August 15th, 2022 | 42 mins 29 secs
Frank decides to create an ML model to translate Akkadian and Sumerian!
-
318: Fixing Performance Issues
August 8th, 2022 | 37 mins 57 secs
.net, .net maui, android, c#, ios, performance, xamarin
We diagnosed and fixed performance problems in the wild and we break down how we did it and what you need to know.
-
317: Performance Benchmarking Code
August 1st, 2022 | 35 mins 7 secs
-
316: Hosting Websites & Web Apps for Free
July 25th, 2022 | 36 mins 5 secs
azure, blazor, cloudflare, functions, html, static web apps, web dev
After a quick update on Frank's drone, we dive into the world of static web apps, websites, and pages that are completely free to host on different platforms.
-
314: Pixy Review - Snap's Mini Drone
July 11th, 2022 | 44 mins 41 secs
drone, pixy, review, snap, snapchat
Our brand new Pixy drone by Snap is here and we break down every positive and negative of this adorable little drone.
-
313: Stop Using Junk In Your Apps
July 4th, 2022 | 37 mins 58 secs
.net maui, android, csharp, dotnet, dotnet maui, ios, ironpython, xamarin
It is a random topic week because we don't know what to talk about in-depth, so we chat up iOS 16 Beta, C# partial methods, scoped keyword, and running python inside of C# on an iPhone with IronPython!
-
312: dotnet workload
June 27th, 2022 | 32 mins 49 secs
.net, .net maui, android, dotnet, ios, workload, xamarin
This week try to demystify the new workload system in .NET! .NET MAUI, Blazor WASM, Source Control, Continuous Integration, and more!
-
311: Goodbye Passwords, Hello Passkeys
June 20th, 2022 | 32 mins 8 secs
ios, macos, passkey, passkeys, passwords, security, xamarin
We break down the big announcement from WWDC that is going to eliminate passwords forever!! Or will it?
-
310: WWDC 2022 Recap
June 13th, 2022 | 50 mins 33 secs
ios, ipados, macos, wwdc, wwdc 2022, xamarin
Everything you need to know about the latest in iOS, macOS, tvOS, watchOS, iPadOS, and so much more from WWDC 2022!
-
309: Where did my OpenGL go?
June 6th, 2022 | 32 mins 14 secs
.net maui, dotnet maui, graphics, mac catalyst, maccatalyst, maui, opengl, xamarin
Frank tried to build a MacCatalyst app with OpenGL and soon realizes that it doesn't exists!!?!?!
-
308: James & Frank Go To Build 2022!
May 30th, 2022 | 44 mins 41 secs
.net maui, dev blox, dotnet maui, maui, volterra, windows, wsa, wsl, xamarin, xaml
Frank and James cover all the great developer bits from Build 2022 including Win UI 3, Project Voleterra, Arm64, .NET MAUI Launch, and so much more.
-
307: All in on .NET MAUI
May 23rd, 2022 | 46 mins 59 secs
.net maui, android, dotnet maui, icircuit, ios, mac, maui, migration, xamarin
.NET MAUI is here, and Frank is all in on building apps with it! He has started to migrate his apps and shares his journey!
-
306: How to Contribute to OSS
May 16th, 2022 | 39 mins 1 sec
.net maui, ai, bindings, c#, csharp, dotnet maui, dotnetmaui, ml, xamarin
Frank had his first PR merged into iOS and macOS for .NET! We explore his journey to getting it accepted
-
305: Breaking Your Own APIs
May 9th, 2022 | 35 mins 46 secs
.net maui, android, billing, dotnet maui, in app billing, ios, maui, xamarin
When is the time to make breaking changes that could completely upset every single user of your library? James is in this situation, and we discuss his options.
-
304: Snap's Pixy... the future of drones?
May 2nd, 2022 | 34 mins 4 secs
android, drones, ios, mobile, photos, pixy, snap, snapchat, xamarin
A $230 drone... with no controller... with no GPS.... is this the future?