#mergeconflict — Public Fediverse posts

Az új agents/ könyvtárba tervezett AI agent erőforrások a kernel coding assistantjaihoz gyűjtenék a promptokat és képességeket — elsőként LLM-alapú, a „Fixes:” tageket használó azonosítót javasolnak. Vajon gyorsabbá teszi ez a hibajavítást? Te használnád ilyen AI-t a kernel fejlesztésében?
https://linuxmint.hu/hir/2026/10/uj-ai-agent-eroforrasok-a-linux-kernelben-mesterseges-intelligencia-segiti-a

#LinuxKernel #AI #AIagents #agents #LLM #SashaLevin #NVIDIA #AGENTSmd #codingassistant #kernel-development #mergeconflict

@OVargas
In case of a #git #mergeConflict I first try rebasing it onto the target branch in #GitLab. If that's not possible, I use #TortoiseGit 🐢 for rebasing. Within 🐢 I then diff all the changes I've made in the remote feature branch and then compare them with a diff between the local feature branch and the remote target branch, which should be the same. Then see if everything locally still builds and if so, rewrite the feature branch.

I just hate merge commits. 🤢

If you've ever spent an hour resolving a merge conflict on a shared branch, you know the feeling of watching this piadina arrive at your table...

#Rubycon2026 #Ruby #DevHumor #MergeConflict #Piadina

New episode of #mergeconflict #podcast - 447: Whoops, I Lost My Keystore http://www.mergeconflict.fm/447 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 446: Mac mini M4 Pro - Honest Developer Reviews http://www.mergeconflict.fm/446 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 445: "Live" from CES 2025 http://www.mergeconflict.fm/445 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 444: Official Family IoT Tech Support http://www.mergeconflict.fm/444 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 443: If 2024 was the year of AI, what is coming in 2025? http://www.mergeconflict.fm/443 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 442: Launching a new visionOS app http://www.mergeconflict.fm/442 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 441: AI Driven Development http://www.mergeconflict.fm/441 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 440: Future of GPTs? Mac Desktops? Headphones? http://www.mergeconflict.fm/440 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 439: One Month with the M4 Mac Mini - Developer Setup Breakdown http://www.mergeconflict.fm/439 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 438: Jon Galloway - From Submarine Office to Software Developer http://www.mergeconflict.fm/438 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 437: .NET 9 Is Here! http://www.mergeconflict.fm/437 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 436: We bought new Mac minis! Now what? http://www.mergeconflict.fm/436 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 435: GitHub Universe Recap + M4 is here with a NEW Mac mini!!! http://www.mergeconflict.fm/435 #dotnet #dotnetmaui #technology

i wrote this #python #cli #tool last year it's pretty good.

#protokolo generates a #changelog from fragment files, kind of like #towncrier, but way less intelligently (in a good way). its purpose is to circumvent the problem where many #vcs commits attempt to edit the same section in the change log file, and they #mergeConflict all the time. (or worse, a pr that is merged late adds its change log to a previous release.)

https://protokolo.readthedocs.io/en/stable/readme.html

#development #programming #git

New episode of #mergeconflict #podcast - 434: Free OSS Controls for Everyone! http://www.mergeconflict.fm/434 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 433: Epic vs Google http://www.mergeconflict.fm/433 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 432: Creating our own color space?!?!? http://www.mergeconflict.fm/432 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 431: Put some Python in your C# with CSnakes http://www.mergeconflict.fm/431 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 430: iOS 18 & Apple Intelligence Preview Hands-On http://www.mergeconflict.fm/430 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - Hands-on with iPhone 16 Pro... Apple Intelligence Coming Soon http://www.mergeconflict.fm/429 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 428: Our Favorite VS Code Extensions http://www.mergeconflict.fm/428 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 427: It's Glowtime! Rumor Edition http://www.mergeconflict.fm/427 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 426: Designing, Developing, Testing, & Productizing a Board Game with Ben Ruiz http://www.mergeconflict.fm/426 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 425: The NEW .NET MAUI Binding System http://www.mergeconflict.fm/425 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 424: Xamarin 2025, New Apple Tax, & Mega .NET MAUI Update http://www.mergeconflict.fm/424 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 423: Should we be building TV apps? http://www.mergeconflict.fm/423 #dotnet #dotnetmaui #technology

New episode of #mergeconflict #podcast - 422: An Introduction to Continuous Integration & Delivery http://www.mergeconflict.fm/422 #dotnet #dotnetmaui #technology