Programmer Humor

32143 readers

108 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 5 years ago

MODERATORS

AgreeableLandscape@lemmy.ml

cat_programmer@lemmy.ml

1262

I'm going to sit down and actually learn git this week (midwest.social)

submitted 10 months ago by seahorse@midwest.social to c/programmerhumor@lemmy.ml

85 comments fedilink hide all child comments

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

[–] noddy@beehaw.org 10 points 10 months ago (1 children)

I prefer rebasing on destination branch before merging. When merging you get all the conflicts at the same time. When rebasing you can address conflicts from one commit at a time. Untangling multiple small knots is easier than one huge spaghetti. Also commit history will be much cleaner.

[–] Shhalahr@beehaw.org 3 points 10 months ago

Go, Team Rebase!