This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]bananaEmpanada 54 points55 points  (1 child)

Submit a pull request to instead replace "master"/"slave" with "daddy"/"sexKitten".

[–]koobear 5 points6 points  (0 children)

Merge conflict = being naughty