Merge Conflict

Episode Archive

Episode Archive

316 episodes of Merge Conflict since the first episode, which aired on July 11th, 2016.

  • 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?

  • var num = 303; var title = $$"""Episode #{{num}}""";

    April 25th, 2022  |  33 mins 9 secs
    .net, c# 11, csharp, csharp 11, dotnet, dotnetmaui, maui, xamarin

    C# 11 is coming in hot with some awesome new previews and we break down our favorite features.

  • 302: .NET MAUI Release Candidate Is Here!

    April 18th, 2022  |  38 mins 22 secs
    .net 6, .net maui, android, dotnet maui, dotnetmaui, ios, maui, xamarin

    It is go time with the .NET MAUI RC!!

  • 301: Going Beyond ZSH

    April 11th, 2022  |  35 mins 53 secs
    bash, dotnet, fish shell, powershell, shell, terminal, xamarin, zsh

    Where did my bash go says James! Well I am swimming with Fish over here says Frank! We explore what the heck is going on in terminals on all of the different operating systems and how to get them setup to your liking.

  • 300 Episodes of Merge Conflict!

    April 4th, 2022  |  1 hr 11 mins
    .net maui, android, celebration, ios, maui, xamarin

    We take your questions live on .NET MAUI, the state of mobile development, how to teach the next generation, and so much more!

  • 299: Databases shouldn’t allow delete

    March 28th, 2022  |  36 mins 47 secs
    android, database, ios, sqlite, xamarin

    Frank explains to James why and how he is doing databases all wrong!

  • 298: The Great M1 Conspiracy

    March 21st, 2022  |  36 mins 41 secs
    apple, dotnet, ios, m1, m1 ultra, m2, mac, rumors, xamarin

    Frank has a grand conspiracy theory when it comes to what is going on with the M1 Ultra and M2. We discuss why they glued two chips together.

  • 297: The Ultra Apple Event Recap

    March 14th, 2022  |  49 mins 47 secs
    apple, apple event, ipad, iphone, iphone se, m1, m1 ultra, mac studio, mobile, xamarin

    We have a full breakdown of the latest Apple event with M1 Ultra, new Mac Studio, iPhone SE 3rd gen, and a new iPad!