Merge Conflict

Episode Archive

Episode Archive

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

  • 166: Disconnecting with a Feature Phone

    September 9th, 2019  |  49 mins 25 secs
    alcatel, android, apps, feature phone, ios, nokia, qin, xamarin

    Smartphones are everywhere and are essential in our day to day lives and our business. James has decided to take a step away from his smartphone and experiment with a few feature phones. He walks us through his journey of trying to find a decent feature phone in the US, what the experience is like, and if he can survive on just a few built in apps.

  • 165: IoT Gifts Make The Best Gifts

    September 2nd, 2019  |  43 mins 50 secs
    3d printing, android, gifts, http, ios, iot, wedding, xamarin

    What happens when you combine IoT, 3D Printing, and a 48 hour deadline to come up with a wedding gift? The most amazing IoT Wedding Clock ever created... by Frank for H+J! Frank breaks down how he built it, how it works, and how you can build it too!

  • 164: Modding the Game Boy Color

    August 26th, 2019  |  38 mins 48 secs
    android, game boy color, gameboy, hacking, hardware, ios, midwest embedding, modding, xamarin

    We have talked about hardware hacking before, but this time it is actually hacking to enhance existing 20 year old hardware! We put a brand new backlit LCD into an original Game Boy Color. Follow along on our not so smooth adventure and find out how this hardware actually works!

  • 163: "Borrowing" Code from the Internet

    August 19th, 2019  |  37 mins 37 secs
    android, blogs, code, github, ios, open source, oss, xamarin

    Stack Overflow, blog posts, GitHub repos... we all live in a beautiful open source world of code sharing. However, what happens if you want to use that code in your library or in your app? What should you do as a good digital citizen?

  • 162: Throttle Those Cancellations

    August 12th, 2019  |  38 mins 17 secs
    android, cancelation, csharp, ios, performance, ui, xamarin

    What is the best way to keep your UI responsive and at peak performance? This week we look at ways of properly throttling and using cancelation tokens efficiently.

  • 161: The World of Embedded Hardware

    August 5th, 2019  |  38 mins 27 secs
    android, embedded, hardware, ios, raspberry pi, xamarin

    Let's enter the world of embedded hardware and how to program on them with CircuitPython!

  • 160: Infrastructure as Code, Signing Packages, & 1 Million Downloads

    July 29th, 2019  |  46 mins 20 secs
    achievements, android, cd, ci, ios, skiasharp, uno, xamarin, yaml

    It is time for lightning topics! 6 topics, 5 minutes each, from you, our listeners. This week we cover package signing, infrastructure as code, ML for everyone, Skia on the web, and tons of fun podcast facts.

  • 159: Cut, Copy, Paste, Delete, Undo

    July 22nd, 2019  |  38 mins 59 secs
    android, documents, ios, redo, state, undo, xamarin

    The title says it all. Why can't we have unlimited undo and redo in our applications! What about cut/copy/paste? How about delete? How do we get this done in our app?

  • 158: Everything Is Awesome

    July 15th, 2019  |  40 mins 57 secs
    adorable, android, feedback, ios, mac book, macbook adorable, xamarin

    It is official.... worst day in history.... MacBook Adorable is officially gone :( That makes us think.... what hardware should we buy to develop on, what software should we use, and what should we do now.

  • 157: FOMO UI Design

    July 8th, 2019  |  38 mins 39 secs
    android, ios, ui design, ux, web, xamarin

    This week we switch it up and take a look at one of the most amazing and yet terrible UI/UX experiences and how it impacts our own apps design and the industry at large.

  • 156: SwiftUI's Tasty Architecture

    July 1st, 2019  |  53 mins 4 secs
    android, fabulous, ios, swift, swiftui, tvos, watchos, wwdc, xamarin

    All of the excitement from WWDC hasn't worn off just yet and we are back with something you may not expect... SwiftUI. Apple unleashed a new code first UI framework for Apple platforms and we have to discuss.

  • 155: Hello iPadOS

    June 24th, 2019  |  56 mins 53 secs
    android, ios, ipados, mac, macos, swiftui, xamarin

    Welcome to the world of iPadOS... iOS API enhancements for iPad! At WWDC Apple made several announcements to not only enable developers to enhance iPad apps, but also bring them to macOS. Frank gives us a full breakdown of what this means for developers and our applications going into this fall's iOS 13 update.

  • 154: Homemade IoT Lights

    June 17th, 2019  |  39 mins 11 secs
    alexa, amazon echo, android, home automation, ios, iot, xamarin

    Another day in the life of Frank and hacking IoT devices! This time he builds his very own IoT light strips that can speak directly to his Amazon Echo with a tiny little $11 device! Tune in to find out how he did it.

  • 153: Building Machine Learning Robots!

    June 10th, 2019  |  47 mins 29 secs
    android, boston dynamics, ios, machine learning, robots, xamarin

    Frank takes us on the wonderful journey of understanding robots, how to build them, how to program them, and how to build machine learning algorithms to make them even better!

  • Special Edition: WWDC19 Recap: Mac Pro, Project Catalyst, SwiftUI, iPadOS, & Security

    June 4th, 2019  |  1 hr 15 mins
    android, dark mode, hardware, ios, ios 13, ipados, mac pro, project catalyst, security, swiftui, wwdc, wwdc19, xamarin, xamarin.forms

    It is that time of year where Apple pulls out all the stops for developers and this year is no different at WWDC. There is a new watchOS, tvOS, iOS, dark mode, project catalyst, SwiftUI, Xcode updates, accessibility improvements, and so much more! We have you covered in this very special edition.

  • 152: Refreshing Hanselman.Forms - Visual, CollectionView, & Serverless Backend

    June 3rd, 2019  |  45 mins 24 secs
    android, collectionview, design, hanselman.forms, ios, material design, optimizing, visual, xamarin, xamarin.forms

    What does it look like to refresh a 5 year old app with the all of the changes in iOS, Android, and Xamarin.Forms? James walks through all of the UI and backend changes he has been making to fully optimize the app. Additionally, he walks through how he is using Azure Functions to revolutionize his backend.