Merge Conflict

Episode Archive

Episode Archive

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

  • Merge Conflict 82: Broken Backs and Updating Apps

    January 29th, 2018  |  42 mins 4 secs
    android, android oreo, app store, cd, ci, ios, ios 11, iphone x, updating, xamarin

    It is 2018 and both iOS 11 and Android O are in full swing on tons of awesome and new devices. What does that mean when you want to update your apps?

  • Merge Conflict 81: It Takes Two to Debug

    January 22nd, 2018  |  50 mins 41 secs
    android, automation, debugging, device debug, dogs, ios, logging, mini husky, visual studio, xamarin

    When something goes wrong, it is time to debug! Or maybe first we should write logs? Maybe we should use the intermediate window? Or perhaps write a unit test? We discuss our pro tips for debugging when something goes wrong.

  • Merge Conflict 80: It's Your Fault We Couldn't Name This Episode

    January 15th, 2018  |  40 mins 1 sec
    .net standard, android, business, c#, css, don syme, f#, ios, llc, performance, technology, xamarin, xamarin.forms

    We are not lawyers! However, we both have our own LLCs. We explain why on this lightning talk week and also tackle your questions around performance, .NET Standard, CSS in Xamarin.Forms, and technologies we think are worth investing in.

  • Merge Conflict 79: Frank Justifies His iMac Pro

    January 8th, 2018  |  43 mins
    android, back to work, imac, imac pro, ios, iphone, new hardware, new year, xamarin

    We kick off the new year by not knowing what to do, what to talk about, or just about anything. All we know is Frank has taken the plunge on the new iMac Pro, so why not have him justify it and discuss when is a good time to update your development hardware and software.

  • Merge Conflict 78: This One is Actually Good

    January 1st, 2018  |  51 mins 2 secs
    ai, ar, best of, bitrise, c#, continuous integration, new year, top of 2017, visual studio, vr, vsts, xamarin, xamarin live player

    Happy 2018! We made it, so let's recap the best in tech, development, life, coffee, and so much more that happened in 2017. We expose our top picks of the year and of course what we are looking forward to in 2018.

  • Merge Conflict 77: `dotnet pack holiday`

    December 25th, 2017  |  43 mins 32 secs
    .net standard, android, devops, holiday hacks, ios, monkeycache, nuget, python, tfs, vsts, xamarin

    In this holiday special we thank our listeners by getting to all of your great questions that you have been asking about python, Visual Studio, DevOps, and so much more. We discuss our holiday hacks that we plan on doing this year along with how we have fallen in love with .NET Standard's new auto NuGet packaging.

  • Merge Conflict 76: We Can't Solve Everyone's Problem

    December 18th, 2017  |  46 mins 4 secs
    android,, c# 7.2, cache, data caching, database, ios, monkey, monkeycache, offline, ooui, windows, xamarin, xamarin.forms

    When having SQLite isn't enough for James he has to go and try to solve offline data caching again with Monkey Cache. We discuss why this open source library happened, where it is going, what are best practices for data caching, and so much more.

  • Merge Conflict 75: The Hello World of Video Production

    December 11th, 2017  |  41 mins 47 secs
    audio, ios, live coding, presentations, production, twitch, video, video production, xamarin, youtube

    Have you ever thought about coding to a live audience? How about producing video content such as How-To guides? We discuss what goes into this long process, what equipment is needed, and several tips and tricks on this week's podcast.

  • Merge Conflict 74: App Distribution, the Hard Way

    December 4th, 2017  |  36 mins 1 sec
    alpha testing, android, app center, app distribution, aws, azure, docker, fastlane, ios, testflight, xamarin

    How do you get your app into your testers' hands? App Center, TestFlight, HockeyApp, Google Play, E-mail? So many options exist, but how do you do it right and get testers signed up fast? We take a look at all the options and some tools fastlane offers.

  • Merge Conflict 73: Program Language Evolution

    November 27th, 2017  |  37 mins 40 secs
    android, c#, ios, java, swift, xamarin

    Keeping up with different operating systems is hard enough, but how do you keep up with all of the new awesome features in C#, Swift, and all of the other amazing languages out there? We discuss how we do it and what is new in C# 7.1, 7.2, and take a glimpse into 8!

  • Merge Conflict 72: Xamarin.Forms on the Web

    November 20th, 2017  |  36 mins 10 secs
    android,, core, ios, ooui, xamarin, xamarin.forms, xaml

    Xamarin.Forms on the web? XAML powering your ASP.NET applications? How can this be so? Well with Frank's new Ooui library the life long dream is now a reality. While still early on, developers are loving it! We discuss where it came from and where it is going next.

  • Merge Conflict 71: Continuous Everything with DevOps

    November 13th, 2017  |  42 mins 16 secs
    android, automation, bitrise, cd mobile center, ci, delivery, devops, integration, ios, visual studio, vsts, xamarin

    James is on a DevOps kick after going on tour with Donovan in South America and he wants to automate everything! It is different this time as he wants full control with Visual Studio Team Services and he even wants to manage his own build machines! Is he crazy? Probably, listen in to find out.

  • Merge Conflict 70: Cloud $$$$

    November 6th, 2017  |  34 mins 54 secs
    android, cloud services, dependency injection, ioc, ios, podcast, podcast setup, xamarin

    It is that time of the year once again! That is right, lightning talks on Merge Conflict. We cover 6 different topics submitted by your, our listeners, in under 30 minutes!

  • Merge Conflict 69: Copy Pasta

    October 30th, 2017  |  34 mins 24 secs
    android, copy paste, git, github, ios, management, sharing code, submodule, xamarin

    When is the right time to fork a repository and send a pull request for a feature request? Or is it better use a submodule in your own repository? Or maybe just copy and paste the code into your solution? We discuss all the possibilities.

  • Merge Conflict 68: Throw Some XAML In It

    October 23rd, 2017  |  38 mins 39 secs
    android, architecture, cross platform, ios, react native, ui, windows, xamarin, xamarin.forms, xaml

    We know how to share our business logic between our applications, but what about some of the user interface. We aren't talking Xamarin.Forms, we are talking cross platform views in native iOS, Android, and Windows apps. What type of architecture is needed and what technologies enable us to do this?

  • Merge Conflict 67: Surviving a Hackathon

    October 16th, 2017  |  42 mins 51 secs
    android, charity, code, devops, hackathon, ios, mobile center, profiling, seattle give camp, xamarin, xamarin.forms

    In a quick follow up, James finally breaks down and learns how to properly learn the profiler. This last weekend Frank & James participated and helped organize a mobile app hackathon for charity. What went right? What went wrong? And will they ever do another hackathon again?