this post was submitted on 04 Apr 2024
1110 points (98.2% liked)

Programmer Humor

19817 readers
21 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
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
1110
Rebase Supremacy (programming.dev)
submitted 8 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev
232 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] jaemo@sh.itjust.works 2 points 8 months ago (1 children)

Here's an example

Say I work on authentication under feature/auth Monday and get some done. Tuesday an urgent feature request for some logging work comes in and I complete it on feature/logging and merge clean to main. To make sure all my code from Monday will work, I will then switch to feature/auth and then git pull --rebase origin main. Now my auth commits start after the merge commit from the logging pr.

[โ€“] Croquette@sh.itjust.works 1 points 8 months ago

Thanks for the example. Rebase use is clearer now.