"'It was fine before we added your code' doesn't mean that the team merged last did a poor job. This is counterintuitive but worth considering. If the merges had happened in the opposite order, the other team would seem to be at fault."
#softwareengineering #developerexperience #mergeconflicts #continuousintegration
Do you experience missed release schedules, flawed releases that must be rolled back, and error reports from customers?
These are common problems arising from the same underlying cause (at scale).
#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
Merge conflicts is the thing that annoys me the most in coding! #git #MergeConflicts #coding #programming
https://dzone.com/articles/pre-commit-hooks-devops-engineer-should-know-to-co - #git pre-commit hooks are a great place to check #security, #MergeConflicts, and #lint both #k8s and any #code. Great article Nicolas Giron and Hicham Bouissoumer.
What if we merged our code! And there were no merge conflicts?
#ProgrammingHumor
#CodeLife
#ProgrammingMemes
#MergeConflicts
#Teamwork
#Collaboration
#CodeMerge
#NoConflictCoding
#CodeTogether
#TechJokes
#github
This doesn’t leave us with a solution to our migration conflicts. (#MergeConflicts? 😃) However, as someone celebrating my one-month anniversary, I see a lot of good and well-intentioned people who perceive the technology, communities, and potential of the #Fediverse in different and conflicting ways. I think it’s helpful to think about how we think about it. How to do we think about the Nature, Strategy, and Use of Mastodon, and in which ways do others have different #frames? 12/12
Today my evening will be spoiled by [rolls dice] #git #MergeConflicts.
Two development teams.
Two branches.
We merge into theirs: 596 files
They merge back into ours: 250,000 files.
*grabs popcorn*
#WebDev #MergeConflicts #SprintEndsTomorrow
