Programmer Humor

19618 readers

783 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago

MODERATORS

218

Rebase Supremacy (programming.dev)

submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev

193 comments fedilink hide all child comments

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

[–] Aux@lemmy.world 0 points 7 months ago (1 children)

Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?

[–] jjjalljs@ttrpg.network 0 points 7 months ago (1 children)

Squash your branch first

[–] rapist1@lemmy.world 1 points 7 months ago

Doesn't this defeat the purpose, may as well merge then no?