#mergeconflicts — Public Fediverse posts
Live and recent posts from across the Fediverse tagged #mergeconflicts, aggregated by home.social.
-
#Nix support is now ready and has been included in the brand new
🔀🦒 #Mergiraf v0.6.0 release!https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.6.0
(Mergiraf is a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't.)
#opensource #coding #programming #cvs #mergeconflicts #git #gitmerge