Merge Conflict
Join Frank & James for a weekly discussion on the world of technology and development including C#, F#, .NET, web, mobile, and more.
Displaying all 2 Episode of Merge Conflict with the tag “git”.
-
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 20: Lightning Talks Round 2
November 21st, 2016 | 36 mins 10 secs
.net, git, lightning talks, macos, mobile marketshare, xamarin, xamarin.mac
It is lightning talk week on Merge Conflict as we cover six different development topics in under thirty minutes.