Merge Conflict

Episode Archive

Episode Archive

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

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

  • Merge Conflict 66: Drawing Pixels with SkiaSharp

    October 9th, 2017  |  45 mins 34 secs
    2d graphics, crossgraphics, google, ios, microcharts, ngraphics, pixel event, skia, skiasharp, urhosharp, xamarin, xamarin.forms

    Google announces a slew of new products including the brand new Pixel 2, which means James has finally placed an order for a new phone. We break down the full Pixel event, but go deeper into our topic of the week of 2D and 3D cross-platform drawing libraries with SkiaSharp.

  • Merge Conflict 65: Worst Plan Ever

    October 2nd, 2017  |  48 mins 28 secs
    android, hackathon, ios, machine learning, planning, project management, trello, xamarin

    A quick follow up on Frank's Hot-dog or Not app he tried to create in a week. After that we take a look at what it takes to completely plan an actual application by yourself or with a full team. We discuss our management style, tools we like, and how we plan out releases.

  • Merge Conflict 64: Machine Learning as a Service

    September 25th, 2017  |  39 mins 10 secs
    android, cognitive services, coreml, ios, ios 11, machine learning, xamarin

    If we aren't talking about machine learning then we are talking about machine learning on Merge Conflict! This week we go through several services and resources to find out what exactly it takes to build hot dog or not!

  • Merge Conflict 63: Who Needs a Phone Anymore

    September 18th, 2017  |  1 hr 15 secs
    android, apple keynote, apple tv, apple tv 4k, apple watch, ios, ios 11, iphone x, watchos, xamarin

    It is that time of the year when Apple unveils all of the brand new toys for consumers and developers. Sure everyone is talking about the new iPhone X, Apple Watch Series 3, and Apple TV 4K , but what about the launch of Xcode 9, iOS 11, and watchOS 4? We got you covered and discuss it all!

  • Merge Conflict 62: Snacking on Android Oreo

    September 11th, 2017  |  52 mins 8 secs
    android, android 8, android oreo, api 26, ios 11, notifications, oreo, picture-in-picture

    We have survived the beta summers and Android 8.0 Oreo is finally out with a plethora of beautiful APIs. We discuss all the delicious bits of this lovely release for both developers and end users.

  • Merge Conflict 61: Getting to the Core of ARCore

    September 4th, 2017  |  37 mins 40 secs
    android, arcore, arkit, augmented reality, ios, light estimation, motion tracking, uwp, virtual reality, vr, windows, xamarin

    We just can't get enough of augmented reality and the awesome new SDKs that are being created for developers to use. This week we discuss Google's attempt for Android and web developers with ARCore.

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