Merge Conflict
Join Frank & James for a weekly discussion on the world of technology and development including C#, F#, .NET, web, mobile, and more.
We found 10 episodes of Merge Conflict with the tag “github”.
-
335: All in on Codespaces
December 5th, 2022 | 38 mins 1 sec
.net maui, codespaces, dotnet, github, xamarin
We explore the world of GitHub Codespaces and all the joy that it can bring to development.
-
324: Revisiting GitHub Copilot
September 19th, 2022 | 32 mins 28 secs
android, copilot, dotnetmaui, github, ios, maui, visual studio, vs code, xamarin
It has been several months since we last talked about GitHub Copilot, the automated AI coding friend inside of Visual Studio & Visual Studio Code. Let's revisit and give our hands on thoughts of what we think of this new technology.
-
291: GitHub Actions All The Things
January 31st, 2022 | 52 mins 49 secs
app center, cd, ci, continuous delivery, github, github actions, ios, macos, xamarin
Frank is finally all in on continuous integration and continuous delivery with .NET 6 and he did it all with GitHub actions!
-
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?
-
101: GitHub Acquired & WWDC 2018 Fully Recapped
June 11th, 2018 | 1 hr 5 mins
acquisition, android, apple, arkit, coreml, github, ios, ios 12, iphone, machine learning, metal, microsoft, tvos 12, uwp, watchos, wwdc, wwdc 2018, xamarin, xamarin.forms
What a way to start June! GitHub was officially acquired by Microsoft and Apple started off it's developer conference by announcing tons of great new software updates and developer APIs. We break down each and every juicy bit.
-
Merge Conflict 97: GitHub + App Center = 💖
May 14th, 2018 | 42 mins 10 secs
android, app center, github, ios, microsoft build, uwp, xamarin, xamarin.forms
We are live from Microsoft Build 2018 with Nilofer Rajpurkar from App Center and Steve Winton from GitHub to discuss the new partnership between Microsoft and GitHub and how they are making mobile app developers' lives better with new integrations for continuous integration.
-
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 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 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 43: DevOps for the Solo Developer
May 1st, 2017 | 42 mins 37 secs
android, appveyor, bitrise, continous delivery, continuous integration, devops, github, hockeyapp, ios, slack, trello, visual studio team services, vsts, windows, xamarin
DevOps, that is right Developer Operations, all the things that you don't want to do manually, so you automate them! This week we talk about build, test, and deploy for all of your mobile applications and .NET libraries.