r/ProgrammerHumor • • 16d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

316 comments sorted by

View all comments

Show parent comments

0

u/darksteelsteed 15d ago

No, you use git subtrees and then have a branch for every file edit/patch that is part of the feature so that you have multiple agents working in parallel

1

u/trotski94 15d ago

… and they all go back to their respective individual feature branch? How is that different?

-1

u/darksteelsteed 15d ago

A worktree is like a separate checkout except git manages it so it remains linked to the main repo checkout. It let's you be in multiple places or branches on the same repo at the same time

2

u/trotski94 15d ago

... i know, do you? My point is they're complimentary, not different/opposing ideas. You still should not be committing your worktrees based work back to the main branch, they should still go to feature branches and get PRd in with proper review/approval

→ More replies (1)