19
So can they be merged or not??
(lemmy.nz)
A community for posting software malfunctions
Deliberately bad software or bad design is not software gore, it must be something unintentional
Icon base by Delapouite under CC BY 3.0 with modifications to add a gradient and shear it
I don’t get how this is software gore? It’s a merge conflict, a kind of common thing in Git.
"Changes can be cleanly merged" — it says at the same time.