Merge Conflict

By 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 podc... more

4.9

8686 ratings

Download on the App Store

Download on the App Store

Get it on Google Play

FAQs about Merge Conflict:

How many episodes does Merge Conflict have?

The podcast currently has 531 episodes available.

Merge Conflict episodes:

July 21, 2025472: How I Vibe Coded a SaaS with VS Code
James has been vibe coding a full production site completely with VS Code and walks us through his steps to get to production and almost to the point of accepting money from customers!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
1h
July 14, 2025471: Cracking Open VS Code AI Agent Mode Code
Frank has explored the VS Code AI Chat Agent Mode code base. We discuss.
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
Links:
Open Source AI Editor: First Milestone
vscode-copilot-chat/src/extension/prompts/node/agent/agentInstructions.tsx at 04ed3815e70b3859591e194902831d7b7aaf10b1 · microsoft/vscode-copilot-chat
vscode-copilot-chat/src/extension/tools/node at 04ed3815e70b3859591e194902831d7b7aaf10b1 · microsoft/vscode-copilot-chat
vscode-copilot-chat/src/platform/parser/node/treeSitterLanguages.ts at 04ed3815e70b3859591e194902831d7b7aaf10b1 · microsoft/vscode-copilot-chat
vscode-copilot-chat/src/extension/mcp/vscode-node/mcpToolCallingLoopPrompt.tsx at 04ed3815e70b3859591e194902831d7b7aaf10b1 · microsoft/vscode-copilot-chat
...more
56min
July 07, 2025470: AI Assisted Coding, .NET MAUI 10, and CarPlay for Everyone
It's lightning topic time! AI Assisted Coding, Archiving a Library, .NET MAUI XAML in .NET 10, 1 Month of Switch 2, CarPlay Live Activities, and new .NET MAUI 10 features.
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
Links:
awesome-copilot/chatmodes/4.1-Beast.chatmode.md at main · github/awesome-copilot
github/awesome-copilot: Community-contributed instructions, prompts, and configurations to help you make the most of GitHub Copilot.
...more
1h
June 30, 2025469: New MCP Server Features
Resources, sampling, prompts, and more!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
44min
June 23, 2025468: aspire CLI, dotnet run app.cs, C# 14 field
We are revisiting some of our favorite recent previews for .NET developers that you may have missed out on!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
37min
June 16, 2025467: There was AI at WWDC 2025
A little Nintendo Switch 2 review and then we go full on with WWDC 2025!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
1h 17min
June 09, 2025466: When James Made Xbox Games
There was a time when James made games professionally, Frank dives into James' past!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
50min
June 02, 2025465: Learning how web development works
James is coding several apps a month and Frank is coding inside the Apple Vision Pro... what could go wrong.
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
53min
May 26, 2025464: Microsoft Build 2025 Recap + A Little Google I/O
Wow! What a week at Microsoft Build 2025 for GitHub Copilot, VS Code, Visual Studio, .NET, and so much more. We get into it!
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
Links:
Developer Tools & .NET | Microsoft Build 2025 - YouTube
Agent mode for every developer - Microsoft for Developers
Connect Once, Integrate Anywhere with MCP - Microsoft for Developers
Vibe Coding a Classic App | Indie Developer Tries No-Code - YouTube
jamesmontemagno/MyMonkeyApp-Swift
...more
1h 8min
May 19, 2025463: Good and Bad Vibes
James has some great vibes and Frank hits some stumbles and is looking for some guidance and next steps.
Frank vibes: https://www.youtube.com/watch?v=3gFn1eGS6Ls
Follow Us
Frank: Twitter, Blog, GitHub
James: Twitter, Blog, GitHub
Merge Conflict: Twitter, Facebook, Website, Chat on Discord
Music : Amethyst Seer - Citrine by Adventureface
⭐⭐ Review Us ⭐⭐
Machine transcription available on http://mergeconflict.fm
Support Merge Conflict
...more
41min

FAQs about Merge Conflict:

How many episodes does Merge Conflict have?

The podcast currently has 531 episodes available.

More shows like Merge Conflict

Hanselminutes with Scott Hanselman by Scott Hanselman

Hanselminutes with Scott Hanselman

379 Listeners

The Changelog: Software Development, Open Source by Changelog Media

The Changelog: Software Development, Open Source

289 Listeners

This Week in Tech (Audio) by TWiT

This Week in Tech (Audio)

3,061 Listeners

The Vergecast by The Verge

The Vergecast

3,717 Listeners

RunAs Radio by Richard Campbell

RunAs Radio

83 Listeners

Syntax - Tasty Web Development Treats by Wes Bos & Scott Tolinski - Full Stack JavaScript Web Developers

Syntax - Tasty Web Development Treats

982 Listeners

Darknet Diaries by Jack Rhysider

Darknet Diaries

8,051 Listeners

Practical AI by Practical AI LLC

Practical AI

208 Listeners

The Modern .NET Show by Jamie Taylor

The Modern .NET Show

34 Listeners

AI DevOps Podcast by Jeffrey Palermo

AI DevOps Podcast

23 Listeners

.NET Rocks! by Carl Franklin and Richard Campbell

.NET Rocks!

243 Listeners

People I (Mostly) Admire by Freakonomics Radio + Stitcher

People I (Mostly) Admire

2,027 Listeners

The Unhandled Exception Podcast by Dan Clarke (@dracan)

The Unhandled Exception Podcast

3 Listeners

Security This Week by Carl Franklin

Security This Week

18 Listeners

Latent Space: The AI Engineer Podcast by Latent.Space

Latent Space: The AI Engineer Podcast

101 Listeners