web02.fireside.fm Sun, 19 Apr 2026 04:10:19 -0500 Fireside (https://fireside.fm) Merge Conflict - Episodes Tagged with “Git” https://www.mergeconflict.fm/tags/git Mon, 30 Oct 2017 00:00:00 -0700 Merge Conflict is a weekly discussion with Frank and James on all things development, technology, & more. After years of being friends, Frank and James finally decided to sit down and start a podcast about their lives as mobile developers using C#, Xamarin, and .NET MAUI. Much more than just another mobile development podcast, Merge Conflict, reaches all areas of development including desktop, server, and of course mobile. They also cover fun things happening in the world of technology and gaming and whatever else happens to be on Frank's and James' minds. en-us episodic Join Frank & James for a weekly discussion on the world of technology and development including C#, F#, .NET, web, mobile, and more. soundbite.fm Merge Conflict is a weekly discussion with Frank and James on all things development, technology, & more. After years of being friends, Frank and James finally decided to sit down and start a podcast about their lives as mobile developers using C#, Xamarin, and .NET MAUI. Much more than just another mobile development podcast, Merge Conflict, reaches all areas of development including desktop, server, and of course mobile. They also cover fun things happening in the world of technology and gaming and whatever else happens to be on Frank's and James' minds. no Xamarin, iOS, Android, UWP, Microsoft, .NET, C#, F#, Machine Learning, AI, Apps, Apple, Development, .NET MAUI, dotnet maui, dotnet soundbite.fm mergeconflictfm@gmail.com Merge Conflict 69: Copy Pasta http://www.mergeconflict.fm/merge-conflict-69-copy-pasta fdacf25d-d5dc-4151-9e45-f6397dce12a5 Mon, 30 Oct 2017 00:00:00 -0700 soundbite.fm full soundbite.fm 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. 34:24 no 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. Follow Us Frank: <a href="http://twitter.com/praeclarum">Twitter</a>, <a href="http://praeclarum.org">Blog</a>, <a href="http://github.com/praeclarum">GitHub</a> James: <a href="http://twitter.com/jamesmontemagno">Twitter</a>, <a href="http://motzcod.es">Blog</a>, <a href="http://github.com/jamesmontemagno">GitHub</a> Music : Amethyst Seer - Citrine by <a href="https://soundcloud.com/adventureface">Adventureface</a> Proudly recorded on <a href="https://zencastr.com/">Zencastr</a> 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.

Follow Us

Sponsored By:

Support Merge Conflict

]]> 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.

Follow Us

Sponsored By:

Support Merge Conflict

]]> Merge Conflict 20: Lightning Talks Round 2 http://www.mergeconflict.fm/53305-merge-conflict-20-lightning-talks-round-2 099b1816-d49f-47a8-a6ff-966eb9aa22bc Mon, 21 Nov 2016 00:00:00 -0800 soundbite.fm full soundbite.fm It is lightning talk week on Merge Conflict as we cover six different development topics in under thirty minutes. 36:10 no It is lightning talk week on Merge Conflict as we cover six different development topics in under thirty minutes. Each topic gets just five minutes of back and forth debate before moving on to the next. This week's topics include the recent Connect(); event, .NET Standard Libraries, Xamarin.Mac, Mobile Market Share, Git, and more. While Frank and James picked a few of the topics, many are from you our listeners who have been tweeting at us about what you want to hear. Get ready for fast paced development fun on this week's Merge Conflict. <a name="Sponsor"></a> <h3>Sponsor</h3> <p><a href="http://bit.ly/mergeconflictbitrise">Bitrise</a>: Continuous Integration and Delivery for your mobile apps. Receive $25 off a Pro plan when you visit <a href="http://bit.ly/mergeconflictbitrise">bitrise.io/mergeconflict</a> and use promo code <strong>RESOLVE-CONFLICT</strong></p> <a name="Links..amp..Show.Notes"></a> <h3>Links &amp; Show Notes</h3> <ul> <li><a href="http://amzn.to/2gseKJn">DJI Mavic Pro Drone</a></li> <li><a href="http://aka.ms/XamarinConnect">Connect(); Xamarin Videos</a></li> <li><a href="http://bit.ly/2gscsdg">VS for Mac</a></li> <li><a href="http://bit.ly/2fpTO0P">Xamarin.Mac for Xamarin.Forms</a></li> <li><a href="http://bit.ly/2fEtGSV">Mobile Market Share</a></li> <li>Frank: <a href="http://twitter.com/praeclarum">Twitter</a>, <a href="http://praeclarum.org">Blog</a>, <a href="http://github.com/praeclarum">GitHub</a> </li> <li>James: <a href="http://twitter.com/jamesmontemagno">Twitter</a>, <a href="http://motzcod.es">Blog</a>, <a href="http://github.com/jamesmontemagno">GitHub</a> </li> <li>Music : Amethyst Seer - Citrine by <a href="https://soundcloud.com/adventureface">Adventureface</a> </li> </ul> <a name="Subscribe"></a> <h3>Subscribe</h3> <ul> <li><a href="https://itunes.apple.com/us/podcast/merge-conflict/id1133064277">iTunes</a></li> <li><a href="https://play.google.com/music/m/I3uqn2paemgy27ls2nqc35wdzha?t%3DMerge_Conflict">Google Play Music</a></li> <li><a href="http://www.stitcher.com/podcast/merge-conflict">Stitcher</a></li> <li><a href="http://pca.st/8tqK">Pocket Casts</a></li> <li><a href="https://overcast.fm/itunes1133064277/merge-conflict">Overcast</a></li> </ul> <p><strong>Merge Conflict may make commission from affiliate links</strong></p> .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. Each topic gets just five minutes of back and forth debate before moving on to the next. This week's topics include the recent Connect(); event, .NET Standard Libraries, Xamarin.Mac, Mobile Market Share, Git, and more. While Frank and James picked a few of the topics, many are from you our listeners who have been tweeting at us about what you want to hear. Get ready for fast paced development fun on this week's Merge Conflict.

Sponsor

Bitrise: Continuous Integration and Delivery for your mobile apps. Receive $25 off a Pro plan when you visit bitrise.io/mergeconflict and use promo code RESOLVE-CONFLICT

Links & Show Notes

Subscribe

Merge Conflict may make commission from affiliate links

Sponsored By:

Support Merge Conflict

]]> It is lightning talk week on Merge Conflict as we cover six different development topics in under thirty minutes. Each topic gets just five minutes of back and forth debate before moving on to the next. This week's topics include the recent Connect(); event, .NET Standard Libraries, Xamarin.Mac, Mobile Market Share, Git, and more. While Frank and James picked a few of the topics, many are from you our listeners who have been tweeting at us about what you want to hear. Get ready for fast paced development fun on this week's Merge Conflict.

Sponsor

Bitrise: Continuous Integration and Delivery for your mobile apps. Receive $25 off a Pro plan when you visit bitrise.io/mergeconflict and use promo code RESOLVE-CONFLICT

Links & Show Notes

Subscribe

Merge Conflict may make commission from affiliate links

Sponsored By:

Support Merge Conflict

]]>