1114

Rebase Supremacy (programming.dev)

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

235 comments fedilink hide all child comments

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

[-] JoYo@lemmy.ml 8 points 8 months ago

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@lemmy.world 7 points 8 months ago

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 8 months ago

Squash your branch first

[-] rapist1@lemmy.world 2 points 8 months ago

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

[-] jjjalljs@ttrpg.network 1 points 8 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 (8 replies)

this post was submitted on 04 Apr 2024

1114 points (98.1% liked)

Programmer Humor

19843 readers

49 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 2 years ago

MODERATORS