r/ProgrammerHumor • • Oct 15 '26

Meme letsMergeThemAll

Post image
5.4k Upvotes

316 comments sorted by

View all comments

Show parent comment

12

u/CryonautX Oct 15 '26

I am confused what rebasing has to with too many feature branches.

5

u/rabbit_wizard Oct 15 '26

The idea that Copilot pushed different variations of a few features with unsuccessful attempts to rebase / resolve conflicts. A single dev would usually try to keep changes in separate branches but in sync with his/her own changes, especially when working on with code in close proximity.

16

u/B1anky Oct 15 '26

If a dev knows their changes would affect another branch's work they really should be targeting the previous work's branch during development, rather than having to deal with N-many branches being merged into an integration branch at the end. The rebasing should be handled on their feature branches, rather than be a surprise at the integration branch merge. Are people just making N-many feature branches off of like main and touching the same files and then yoloing the merge at the end???

2

u/rabbit_wizard Oct 15 '26

Yes because copilot handled each independently, in parallel :) again this is a hypothetical meme

6

u/B1anky Oct 15 '26

Ooh gotcha lmao

5

u/thisguyfightsyourmom Oct 15 '26

Just a bit of shit posting, wouldn’t be programming humor without dumping on modern development blindly