this post was submitted on 04 Apr 2024

1115 points (98.1% liked)

Programmer Humor

19832 readers

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

MODERATORS

1115

Rebase Supremacy (programming.dev)

submitted 8 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] 1 points 7 months ago* (last edited 7 months ago) (1 children)

If “we work in a way that only one person can commit to a feature”, you may be missing the point of collaborative distributed development.

[–] expr 1 points 7 months ago

No, you divide work so that the majority of it can be done in isolation and in parallel. Testing components together, if necessary, is done on integration branches as needed (which you don't rebase, of course). Branches and MRs should be small and short-lived with merges into master happening frequently. Collaboration largely occurs through developers frequently branching off a shared main branch that gets continuously updated.

Trunk-based development is the industry-standard practice at this point, and for good reason. It's friendlier for CI/CD and devops, allows changes to be tested in isolation before merging, and so on.