Merge Conflict

Merge Conflict

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.

Episodes

May 15, 2022 39 min

Frank had his first PR merged into iOS and macOS for .NET! We explore his journey to getting it accepted

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

    Support Merge Conflict

    Share
    Mark as Played

    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.

    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

    Support Merge Confl...

    Share
    Mark as Played

    A $230 drone... with no controller... with no GPS.... is this the future?

    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

    Support Merge Conflict

    Links:

  • Meet Pixy: Snap's Mini Drone Camera
  • Snap is making… a drone? 🚁 - Yo...
  • Share
    Mark as Played

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

    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

    Sponsored By:

  • Syncfusion: Syncfusion offers the largest selection of controls for Xama...
  • Share
    Mark as Played

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

    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

    Support Merge Conflict

    Links:

  • .NET MAUI Release Candidate - Ready for cross-platform app development - .NET Blog
  • dotnet-presentations/dotnet-maui...
  • Share
    Mark as Played
    April 10, 2022 35 min

    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.

    Register for James's webinar with Syncfusion on .NET MAUI & Blazor Hybrid: https://bit.ly/3qV6Fij

    Fish Shell: https://fishshell.com/

    Follow Us
  • Frank: Twitter, Blog, GitHub
  • James: Twitter, Blog, GitHub
  • Me...
  • Share
    Mark as Played
    April 3, 2022 71 min

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

    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

    Support Merge Conflict

    Share
    Mark as Played

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

    Email us for episode 300 - mergeconflictfm@gmail.com

    Watch episode 300 live - https://www.youtube.com/watch?v=LIyENBHwRX0

    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 ht...

    Share
    Mark as Played
    March 20, 2022 36 min

    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.

    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

    Support Merge Conflict

    Share
    Mark as Played
    March 13, 2022 49 min

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

    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

    Support Merge Conflict

    Share
    Mark as Played

    Who doesn't love security? Who doesn't love security inside of the app sandbox?!?! We break down file-access and all of its complexity when building sandboxed apps for iOS, macOS, Android, and Windows!

    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 availa...

    Share
    Mark as Played
    February 28, 2022 35 min

    What to do when there are new APIs that improve but don't deprecate old ones? Do you throw away your old code? Write compatibility layers? Or do you just keep on with what you have? We discuss.

    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:...

    Share
    Mark as Played
    February 21, 2022 36 min

    It’s here already…!!!??!!!! That’s right, .NET 7 is on its way with awesome new features.

    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

    Sponsored By:

  • Syncfusion: Syncfusion offers the largest selection of controls for Xamarin.i...
  • Share
    Mark as Played

    Measure, measure, measure with dotnet-trace a "new" tool that Frank has been exploring to make apps super performant.

    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

    Support Merge Conflict

    Links:

  • Implementing In-App Subscr...
  • Share
    Mark as Played

    James is back on in-app purchases and this time has a complete deep dive into all things in-app subscriptions!

    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

    Sponsored By:

  • MagicMind: A magical elixir that makes you focus better ...
  • Share
    Mark as Played
    January 31, 2022 52 min

    Frank is finally all in on continuous integration and continuous delivery with .NET 6 and he did it all with GitHub actions!

    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

    Sponsored By:

  • Syncfusion: Syncfusion offers the largest...
  • Share
    Mark as Played
    January 24, 2022 45 min

    We answer all of your questions! Which seem to mostly be about .NET MAUI :)

    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

    Support Merge Conflict

    Share
    Mark as Played
    January 17, 2022 44 min

    Frank is in a rush to try to get out an app into the app store in record time, but he runs up against those bumps that we have talked about so many times. We discuss his biggest road blocks.

    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://merge...

    Share
    Mark as Played
    January 10, 2022 41 min

    We give an update to our holiday hacks that have become real things that we need to actually care about. Did we go too far, or not far enough? We discuss.

    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

    Support Merge Conflict

    Share
    Mark as Played
    January 3, 2022 53 min

    We break down the winners and laggers in tech from 2021 as we look forward to the excitement of what is to come in 2022.

    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

    Support Merge Conflict

    Share
    Mark as Played

    Popular Podcasts

      Current and classic episodes, featuring compelling true-crime mysteries, powerful documentaries and in-depth investigations.

      Crime Junkie

      If you can never get enough true crime... Congratulations, you’ve found your people.

      Morbid: A True Crime Podcast

      It’s a lighthearted nightmare in here, weirdos! Morbid is a true crime, creepy history and all things spooky podcast hosted by an autopsy technician and a hairstylist. Join us for a heavy dose of research with a dash of comedy thrown in for flavor.

      Stuff You Should Know

      If you've ever wanted to know about champagne, satanism, the Stonewall Uprising, chaos theory, LSD, El Nino, true crime and Rosa Parks then look no further. Josh and Chuck have you covered.

      Sympathy Pains

      Hosted by Laura Beil (Dr. Death, Bad Batch), Sympathy Pains is a six-part series from Neon Hum Media and iHeartRadio. For 20 years, Sarah Delashmit told people around her that she had cancer, muscular dystrophy, and other illnesses. She used a wheelchair and posted selfies from a hospital bed. She told friends and coworkers she was trapped in abusive relationships, or that she was the mother of children who had died. It was all a con. Sympathy was both her great need and her powerful weapon. But unlike most scams, she didn’t want people’s money. She was after something far more valuable.

    Advertise With Us

    For You

      Music, radio and podcasts, all free. Listen online or download the iHeart App.

      Connect

      © 2022 iHeartMedia, Inc.