Merge Conflict

Latest Episodes:

Merge Conflict 4: How Not to Maintain a Server Aug 01, 2016

Show notes

This week Frank & James discuss the importance of a great local experience, server maintenance, and Apple’s amazing CloudKit. We take a look at what it takes to make an application that is cloud connected and what services are available to developers so we don’t have to actually maintain a server. What have we tried, what has worked, what hasn’t, and what we would start with today?

Links & Show Notes

CloudKit
Azure App Service Mobile Apps
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Music : Amethyst Seer - Citrine by Adventureface

Support Merge Conflict

Merge Conflict 3: Your First Open Source Project Jul 25, 2016

Show notes

What happens after that Initial Commit to GitHub? This week on Merge Conflict we discuss how we go about starting new repositories on GitHub. Did you know that the README.md file is the most important file in your repository? We talk about how and what should go into it and what resources there are for learning markdown. Finally, we take a serious look into how to handle Issues and Pull Requests "properly".

Links & Show Notes

GitHub Issue & Pull Request Templates
Appveyor CI for .NET
LaTeX
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Music : Amethyst Seer - Citrine by Adventureface

Support Merge Conflict

Merge Conflict 2: Augmented Reality #PokemonGo Jul 18, 2016

Show notes

Pokémon Go and its augmented reality pocket monster capturing has taken the world by storm. This week we discuss if AR has finally hit critical mass and general acceptance. Frank and James also debate over what exactly AR is and how the Hololens, Oculus Rift, and HTC Vive fit in. What does the future hold for AR? All this and more on this week's Merge Conflict.

Links & Show Notes

Pokémon Go
Frank's Xamarin Evolve AR Talk and Dragon App
Geocaching: Real world scavenger hunt
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Music : Amethyst Seer - Citrine by Adventureface

Support Merge Conflict

Merge Conflict 1: Build up to an app release Jul 11, 2016

Show notes

You have spent months or years developing an app, but now you are at that last 5%. Frank & James walk through the last steps before launch day. We take a look at how to prepare for that final submission before launch day including what sort of documentation, website, and support you need to be prepared for. Of course, we can't forget about that ever so important app store artwork, icon, and marketing jargon that must all be put together before it is time to go live.

Links & Show Notes

Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Continuous Development for iOS by Frank
Music : Amethyst Seer - Citrine by Adventureface

Support Merge Conflict

Merge Conflict 0: Merge Conflict Jul 11, 2016

Show notes

Welcome to Merge Conflict, a weekly discussion around all things development, technology, and more. This week we kick things off with an introduction to the Merge Conflict podcast and its hosts Frank Krueger and James Montemagno.