SirHaxalot comments on So can they be merged or not??

So can they be merged or not?? (media.piefed.social)

submitted 1 month ago by OliMoli2137@piefed.social to c/software_gore@programming.dev

5 comments fedilink hide all child comments

github at its finest ^

you are viewing a single comment's thread
view the rest of the comments

[–] SirHaxalot@nord.pub 9 points 1 month ago (1 child)

I don’t get how this is software gore? It’s a merge conflict, a kind of common thing in Git.

[–] smaximov@lemmy.world 6 points 1 month ago

"Changes can be cleanly merged" — it says at the same time.

parent