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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

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

(page 3) 50 comments

sorted by: hot top controversial new old

[–] Crow@lemmy.blahaj.zone 2 points 7 months ago (29 children)

I've been using merge, and I hate that I don't even know what rebase really does

[–] BlackPenguins@lemmy.world 1 points 7 months ago* (last edited 7 months ago) (2 children)

Merge is taking all the code from the master branch and combining it with the task branch, resulting in a commit for just the merge itself.

Rebase is "re-basing" where your task branch was created from off the master branch. It essentially takes all the commits from master that happened since you branched, REWRITES THE HISTORY of your task branch by inserting those master branch commits before all your existing commits, and effectively makes your task branch look like it was branched yesterday instead of like 4 weeks ago. You changed where your task branch originated on the master. You moved its base.

Atlassian does a fantastic writeup on this.

load more comments (2 replies)

load more comments (28 replies)

[–] JATtho@sopuli.xyz 1 points 7 months ago* (last edited 7 months ago)

To produce 1 commit, I end up rebasing the damm thing at least 3 times. If there is an problem, it's at least 2³ times.

[–] Zagorath@aussie.zone 1 points 7 months ago (8 children)

Okay this is the second time I've seen Sydney Sweeney referenced in a meme in less than half a day. I had never heard of her before. Who is she, and why is she suddenly attracting so much meme attention?

load more comments (8 replies)

load more comments