Programmer Humor

19623 readers

507 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

[email protected]

1110

Rebase Supremacy (programming.dev)

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

232 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)

You're right, I'm not representing the merge correctly. I was thinking of having multiple merges because for a long running patch branch you might merge main into the patch branch several times before merging the patch branch into main.

I'm so used to rebasing I forgot there's tools that correctly show all the branching and merges and things.

Idk, I just like rebase's behavior over merge.

[–] [email protected] 4 points 7 months ago (1 children)

The thing is, you can get your cake and eat it too. Rebase your feature branches while in development and then merge them to the main branch when they're done.

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

👏 Super duper this is the way. No notes!