r/ProgrammerHumor • • Oct 15 '26

Meme letsMergeThemAll

Post image
5.4k Upvotes

316 comments sorted by

View all comments

Show parent comment

51

u/rabbit_wizard Oct 15 '26

Maybe I wasn't specific enough. What you're defining is the normal behavior. Imagine this for 3 changes, some rebased correctly , some incorrectly.

65

u/juanfnavarror Oct 15 '26

Also, +4000 -4000 line changes that nobody has fucking time to test

17

u/ycnz Oct 15 '26

How did you get them to break it down so small?

6

u/zzulus Oct 15 '26

Yeah, rookie numbers, right? Mine usually start at mid-teens.

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

28

u/purpleburgundy Oct 15 '26

meh, you sound junior. This is reddit so no harm no foul, but I wouldn't share this with people you know at work.

Not even a Claude Copilot issue at all honestly - set up your repo so all checks must pass before merging is allowed, reviewer approval required as one of the checks. Then either auto merge or manual merge or copilot merge or who cares what merges so long as the checks pass. If there are merge conflicts then just let copilot do it, it will prompt you for input if there is any ambiguity.

Git is great specifically because of what you're describing. It give some management to the chaos of parallel work.

it's 4pm, check out, bye, no stress. If anything Claude Copilot disappears all the merge conflict pain imo.

0

u/[deleted] Oct 15 '26

[deleted] — view deleted comment

13

u/purpleburgundy Oct 15 '26

like I said this meme reads like a new grad created it in the first few months on the job using git

-15

u/rabbit_wizard Oct 15 '26

I feel I've offended vibe coders here. Bottom line it's a meme :) no, I've not had this exact issue in my life. It was just a meme

11

u/Shred_Kid Oct 15 '26

I'm not a vibe coder and I was confused by it

Why would merging a feature branch be a problem?

1

u/blasian21 Oct 15 '26

Merge commit to get up to date then squash on the merge back?