#mergeconflict — Public Fediverse posts
Live and recent posts from across the Fediverse tagged #mergeconflict, aggregated by home.social.
-
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...
-
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.)
-
On this week's pod we discuss upgrades... #MacBookAir15, #Xcode15, #macOS, Billing Libraries, Internet, and GPUs!
Listen: https://www.mergeconflict.fm/363
Watch: https://www.youtube.com/watch?v=ewACXnK9Rkk
#podcast #mergeconflict #programming #development #developerpodcast #dotnet