this post was submitted on 04 Apr 2024

1115 points (98.1% liked)

Programmer Humor

19694 readers

118 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

1115

Rebase Supremacy (programming.dev)

submitted 7 months ago by JPDev to c/programmer_humor

238 comments fedilink hide all child comments

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

[–] [email protected] 2 points 7 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.

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

Thanks for the example. Rebase use is clearer now.