Merge Conflict

Episode Archive

Episode Archive

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

  • Merge Conflict 60: Hacking Frank's Apartment

    August 28th, 2017  |  35 mins 4 secs
    android, azure, azure functions, c# 8, hacking, ios, navigation, serverless compute, soylent, xamarin, xamarin.forms

    We are back with lightning talk week here on Merge Conflict. We cover 6 awesome topics in 30 minutes! This week we look at C# 8, Bottom Navigation on Android, Hacking Frank's Apartment with Serverless Compute, and so much more!

  • Merge Conflict 59: Managing Open Source Projects

    August 21st, 2017  |  52 mins 47 secs
    c#, contributing, github, issues, maintaining, merge conflict, open source, projects, pull requests, sqllite-net, xamarin

    This week we take an inside look at what it takes to actually maintain an open source project or in James' case 50 open source projects. How do you handle issues, PRs, CI, and how to stay sane when that blue GitHub notification bubble will never go away?

  • Merge Conflict 58: Dealing with Rejection

    August 14th, 2017  |  42 mins 38 secs
    android, app store, developer, google play, guidelines, ios, rejection, xamarin

    It is that dreaded time in every iOS developer's life when you get that rejection notice from the App Store because you broke one or eight of the App Store guidelines. This week we look at how to deal with these rejections and how to handle phone calls with Apple!

  • Merge Conflict 57: Let's Learn the Machines

    August 7th, 2017  |  47 mins 30 secs
    ai, android, computers, coreml, ios, ios 11, machine learning, tensorflow, xamarin

    Why bother with ARKit when you can learn all about the machines with CoreML! This week we explore all the goodies that Apple has for us in iOS 11's CoreML. We also attempt to demystify exactly what is machine learning and how to get started.

  • Merge Conflict 56: Take on ARKit

    July 31st, 2017  |  51 mins 4 secs
    android, apple, arkit, augmented reality, ios, ios 11, pokemon go, tango, urho3d, urhosharp, xamarin

    Apple has blessed us with a beautiful API for augmented reality with ARKit and this week we investigate all of the awesome baked in, what you can and can't do with it, and look at all the awesome things people are already building.

  • Merge Conflict 55: Mac vs PC

    July 24th, 2017  |  50 mins 43 secs
    development, mac, mac vs pc, macos, pc, visual studio, windows 10, xamarin

    It is that age old debate... Mac vs PC! What is the most optimal operating system for development, what are the ups and downs of each, and what are our favorite tools to keep us productive regardless of where we are working?

  • Merge Conflict 54: Dropping in on the iPad

    July 17th, 2017  |  47 mins
    android, augmented reality, drag drop, ios, ios 11, ipad, iphone, machine learning, wwdc, xamarin, xamarin.forms

    iOS 11 is packed full of awesome with machine learning, augmented reality, and a full file system, but who cares about that? Let's talk about our new favorite feature: Drag & Drop!

  • Merge Conflict 53: Document All The Things

    July 10th, 2017  |  57 mins 49 secs
    .net, android, async, await, docs, documentation, github, github pages, ios, pwa, tasks, wyam, xamarin

    It has been said that if a feature has not been documented, than it might as well not exist. It could not be more true from our findings and this week we finally take a look at all things documentation! We also get to your listener feedback on this special 1 year anniversary episode!

  • Merge Conflict 52: Bug Fixes and Improvements

    July 3rd, 2017  |  47 mins 35 secs
    .net standard, android, app store, code coverage, google play, ios, updates, user feedback, windows, xamarin

    Will Frank ever update his apps in the app store? When, how, and what should go into that super important app update that your users are expecting? We investigate what has changed for us and the app stores in the last year.

  • Merge Conflict 51: The Core Developer Experience

    June 26th, 2017  |  39 mins 58 secs
    .net, .net core, android,, aws, azure, c#, cli, ios, linux, server, visual studio, visual studio mac, xamarin

    .NET on Linux? Yes we can with .NET Core! This week we tackle what it is like to develop for the server and the web using the new fancy Core tooling with .NET Core and ASP.NET Core.

  • Merge Conflict 50: We Have Standards

    June 19th, 2017  |  37 mins 6 secs
    .net standard, android, app store, c#, coding, devops, e3, ios, ios 11, lightning talks, microsoft, nintendo, ratings, review, standards, xamarin

    It is that time again, lightning talks! We cover 6 different topics in under 30 minutes! This week we talk coding standards, documentation, E3, app reviews, and so much more!

  • Merge Conflict 49: The Magic of MVVM

    June 12th, 2017  |  43 mins 43 secs
    android, architecture, ios, mvc, mvvm, mvvmcros, mvvmlight, mvx, uwp, xamarin, xamarin.forms

    We are back to talk architecture with MVVM, that is right Model-View-ViewModel, and all of the awesome stuff that comes along for the ride with the fantastic frameworks available.

  • Special Edition: WWDC 2017 Recap

    June 8th, 2017  |  1 hr 19 mins
    apple, augmented reality, imac pro, ios, ios 11, ipad pro, macbook, machine learning, macos high sierra, wwdc, wwdc 2017, xamarin, xcode 9

    WWDC has come to a close and we are here to fill you in all the news from the largest Apple Developer event of the year.

  • Merge Conflict 48: Frank Mocks Interfaces

    June 5th, 2017  |  37 mins 46 secs
    .net, android, api design, architecture, c#, design time, ios, repl, sketch, windows, xamarin, xamarin live player

    To create design time data or not to create design time data, that is the question? Or is it better to mock out all of your interfaces or say heck let's code straight to the API end points? We tackle these tough questions.

  • Merge Conflict 47: You Got Some F# in My C#

    May 29th, 2017  |  54 mins
    .net, android, c#, c# 7, f#, ios, language, pattern matching, tuples, visual studio, windows, xamarin

    C# 7 is here! The most functional version of C# to date. This week we break down every single new feature and let you know what we love and what we think is just okay.

  • Merge Conflict 46: Building the Xamarin Live Player

    May 22nd, 2017  |  47 mins 48 secs
    .net, android, build 2017, debugging, ios, msbuild, reactive, visual studio, windows, xamarin, xamarin live player

    The dream of continuous deployment and debugging your Android and iOS apps from Visual Studio with nothing more than a device is now a reality. We talk shop on what the Xamarin Live Player is and how we built it.