#Mergeconflict
LightNews LightNews
pr0grammerhum0r.bsky.social
mergeConflict
April 30, 2025 at 10:00 AM
thimok.bsky.social
Keep those feature branches short-lived folks. #Software #Engineer #SoftwareEngineering #Humor #Git #Branch #Merge #MergeConflict
June 27, 2025 at 5:01 AM
dot.net
Today's #MergeConflict Podcast talks AOT and making libraries AOT compatible and trimmable, so others can leverage the improvements. Listen in. 🎧 https://msft.it/63324quZzk
Merge Conflict Podcast title screen. text reads: All Things .NET Trimming & Native AOT with Frank Krueger and James Montemagno
March 20, 2025 at 5:25 PM
dot.net
Today on the #MergeConflict podcast, @JamesMontemagno and Frank Krueger (@praeclarum) talk Model Context Protocol (MCP) Servers. Listen in. 🎧 https://msft.it/63327qLlIz
Merge Conflict Podcast title screen. text reads: Hello Model Context Protocol (MCP) Servers with Frank Krueger and James Montemagno
April 10, 2025 at 12:10 AM
dot.net
In this #MergeConflict Podcast, we explore what spec-driven development is and a new toolkit from GitHub that streamlines the approach when using AI. Listen in: msft.it/63325si375
Merge Conflict Podcast title screen. text reads: All in on Spec-Driven Development with Frank Krueger and James Montemagno
September 15, 2025 at 1:15 PM
aquablueshadow.bsky.social
I'll be going live soon to play #Gemporium courtesy of #MergeConflict!

Gameplay starts at 12:30pm CDT to those interested in checking it out!
August 6, 2025 at 5:00 PM
rrd108.bsky.social
When vibe coders use multiple agents simultaneously, they'll quickly encounter the reality of merge conflict. 💥 It's the moment the collective vibe hits a wall. #DevLife #AIagents #MergeConflict #CodingBlues
November 2, 2025 at 5:43 PM
dot.net
#MergeConflict Podcast's Frank Krueger (praeclarum) is on a journey to update all of his libraries to the latest #dotNET. In today's podcast, we hear about why and the lessons he learned. Listen in. 🎧 https://msft.it/63324UI9hu
Merge Conflict Podcast title screen. text reads: Modernizing .NET Libraries with Frank Krueger and James Montemagno
February 20, 2025 at 10:25 PM
lothrop.de
Still looking for the #MergeConflict podcast crew.
November 15, 2024 at 8:17 PM
dot.net
It's been a big month for .NET Devs!
.NET 10 is officially here alongside #VisualStudio 2026! On today's #MergeConflict Podcast, we hear about major performance boosts, new C# features, F# refinements, and AI-powered tooling. Catch all the highlights: msft.it/63327tnbct
#dotNET #VisualStudio
Merge Conflict Podcast title screen. text reads: .NET 10 and Visual Studio 2026 with Frank Krueger and James Montemagno
December 1, 2025 at 9:15 PM
dot.net
Just listened to #MergeConflict tour through AI coding agents:
• MCP tools, custom agents, plugins, hooks
• The new #dotNET Skills repo (P/Invoke, MSBuild, diagnostics, binlogs)
• Agents auto‑load the right skill and do the right thing
👂️ www.mergeconflict.fm/506
Merge Conflict Podcast Title Screen. Text reads: Merge Conflict with Frank Krueger and James Montemagno. Episode 506: We have no skills
March 26, 2026 at 6:10 PM
dot.net
GitHub Copilot Agent Mode is here! ...and the #MergeConflict Podcast discusses new hot reloading capabilities, more AI in Apple Notes, and overheating our Mac minis! Listen in. 🎧 https://msft.it/63325UIY1l
Merge Conflict Podcast title screen. text reads: AI Agents, Hottest Reloading, & Apple Notes in 2025 with Frank Krueger and James MontemagnoAI Agents, Hottest Reloading, & Apple Notes in 2025
February 27, 2025 at 1:20 AM
gorilla.moe
Look 👀 .. how beautiful is this resolve (git/jj) conflicts view in #neovim?

#git #merge #mergeconflict #conflict #resolveconflicts #resolve #jj #jujutsu
July 10, 2026 at 3:52 AM
magindaravt.bsky.social
Thank you to @seagamethetic.bsky.social for the event, and to ShamefulGuys, MergeConflict, and RhythmDrGame for a chance to cover your games!

This stream is a part of The Days of Ramadan Steam Festival
store.steampowered.c...
The Days of Ramadan Festival 2025
The Days of Ramadan Festival 2025 - The Ultimate Culture and Gaming Event
store.steampowered.com
March 13, 2025 at 5:00 AM
james.montemagno.com
On this weeks #mergeconflict I break down my entire vibe code philosophy and how I work directly with VS Code & GitHub Copilot. Tips, tricks, and getting this into production.

www.mergeconflict.fm/460?t=2310

#dotnet #blazor #vscode #githubcopilot
Untitled Episode
James is all in Vibe Coding, what really is "end of life" for software and for devices, Switch 2 pre-orders are on, and new Mac mini docks!
www.mergeconflict.fm
April 29, 2025 at 6:27 PM
programmerhumor-io.bsky.social
Create New Repo Fixes Everything

#programming #git #versioncontrol #devops #Mergeconflict

https://programmerhumor.io/git-memes/create-new-repo-fixes-everything-infb
Create New Repo Fixes Everything
May 18, 2026 at 1:15 AM
dot.net
In this #MergeConflict Podcast episode, @praeclarum and @JamesMontemagno discuss this year’s Octoverse; uncovering how AI, agents, and typed languages are driving the biggest shifts in software development in more than a decade. Listen in: msft.it/63326tRpQp
Merge Conflict Podcast title screen. text reads: Breaking Down the 2025 Octoverse Report with Frank Krueger and James Montemagno
November 25, 2025 at 12:45 AM
dot.net
In today's #MergeConflict, we dive into Tiny Tool Town — a GeoCities‑style app hub for tiny dev utilities.

Drop in for practical takeaways on multi‑model AI pipelines, CI/publishing tips, sandboxing/TestFlight pitfalls, & why tiny apps are booming. 🎧️ buff.ly/VxPEm42
Merge Conflict Podcast Title Screen. Text reads: Merge Conflict with Frank Krueger and James Montemagno. 503: Welcome to Tiny Tool Town
March 5, 2026 at 8:02 PM
dot.net
Discover the machine learning breakthrough changing everything: rectified flow.

In today's #MergeConflict Podcast, Frank breaks down how this revolutionary technique replaces 1,000-step diffusion with just 10. Listen in... 👂️ buff.ly/U4nLApM
February 25, 2026 at 3:25 PM
mapsui.bsky.social
Another Mapsui mention on mergeconflict #483 www.mergeconflict.fm/483 I guess this is the app, android: play.google.com/store/apps/d... ios: apps.apple.com/us/app/meiss...
483: Never too late to migrate & modernize
It's true, you can migrate and modernize your app at any stage... but it is really important when you can no longer ship app updates because you really need to update to newer frameworks!
www.mergeconflict.fm
October 13, 2025 at 5:58 PM
dot.net
In this #MergeConflict podcast, we dive deep into:
✔️ why users expect consistency
✔️ how small details create polish
✔️ and why understanding your users' mental models beats flashy design every time
...all with real-world examples. Listen in... 👂️ buff.ly/FRmqvxH
Podcast cover for Merge Conflict — episode "UI.md: Opinionated design rules for coding agents" with hosts credited on the left; dark left panel lists the topic and the right features a bold MERGE CONFLICT title and podcast logo.
July 17, 2026 at 9:00 PM
dot.net
There was a time when @JamesMontemagno made games professionally. In today's #MergeConflict podcast, we dive into James' past! Listen in. 🎧 https://msft.it/63322SQQBM
Merge Conflict Podcast title screen. text reads: When James Made Xbox Games with Frank Krueger and James Montemagno
June 25, 2025 at 6:33 PM
dot.net
It's true, you can migrate and modernize your app at any stage... In this #MergeConflict podcast episode, James Montemagno and Frank Krueger discuss how it's never too late to migrate and modernize. Listen in: msft.it/63328sFOD6
Merge Conflict Podcast title screen. text reads: Never too late to migrate & modernize with Frank Krueger and James Montemagno
October 13, 2025 at 9:31 PM
gitkraken.com
🚀 GitKraken Desktop 10.8.0 is here!
Introducing Conflict Prevention, helping teams detect and resolve merge conflicts before they happen. Plus, cherry-pick multiple commits and leverage AI-powered commit messages.
View the full release: help.gitkraken.com/gitkraken-de... #gitkraken #mergeconflict
GitKraken Desktop Release Notes
Release notes for the most up-to-date version of GitKraken Desktop. Discover what new features, improvements, and bug fixes, have been added to this version!
help.gitkraken.com
March 17, 2025 at 8:43 PM