Programmer Humor

19315 readers

199 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

1093

Rebase Supremacy (programming.dev)

submitted 6 months ago by [email protected] to c/[email protected]

219 comments fedilink hide all child comments

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

[–] [email protected] 8 points 6 months ago (11 children)

Anyone mind explaining to me how git rebase is worth the effort?

git merge has it's own issues but I just don't see any benefit to rebase over it.

[–] Aux 7 points 6 months ago (5 children)

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

[–] [email protected] 0 points 6 months ago (2 children)

Squash your branch first

[–] rapist1 2 points 6 months ago (1 children)

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

[–] [email protected] 1 points 6 months ago

Do not merge your unfinished stuff into main.

I don't like merging main into my branch because I don't understand git, and I feel like that can make a confusing history.

load more comments (2 replies)

load more comments (7 replies)