this post was submitted on 18 Jan 2024
235 points (96.4% liked)

Programmer Humor

20499 readers
1393 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

founded 2 years ago
MODERATORS
[email protected]
[email protected]
[email protected]
[email protected]
235
DO NOT MERGE (feddit.dk)
submitted 1 year ago by [email protected] to c/[email protected]
32 comments fedilink hide all child comments
 

Merged

top 32 comments
sorted by: hot top controversial new old
[–] [email protected] 84 points 1 year ago (2 children)

Heh, a funny collision of terms.

The green Merged means that the pull request was submitted into the branch.

The DO NOT MERGE text is an instruction for automerger. Android is developed in a truly startling amount of related git branches. Automerger is the tool that propagates commits back and forth to make sure pull requests get to all flavours, versions and devices.

DO NOT MERGE tells Automerger not to propagate that pull request to newer versions of Android, i.e. it's a fix for the currently released version that's not relevant to the next development version of Android for whatever reason.

Also seen, although more rarely, is DO NOT MERGE ANYWHERE which tells Automerger not to propagate the pull request to any other branch other than where it was originally submitted, including branches for related products on the same version of Android.

[–] [email protected] 15 points 1 year ago

Interesting, thanks for explaining. Like someone else was saying it is already in AOSP not introduced in lineage which makes sense since it is just a cherrypick

[–] [email protected] 1 points 1 year ago

Out of curiosity, any idea what automerger they use? I have always been on the lookout for one for hobby projects.

[–] [email protected] 45 points 1 year ago (2 children)

But thanks for keeping my phone up to date, it is appreciated ♥

[–] [email protected] 14 points 1 year ago

Same, I run 3 devices all on Lineage and its great. Who know that you could still get updates and support for a device from 10 years ago, suck on that apple.

[–] [email protected] 1 points 1 year ago* (last edited 1 year ago)

It's just kind of sucks that updates consistently breaks banking apps and other stuff relying of passing safetynet. Every time I update I have to do the Magisk workaround again which is really annoying.

[–] [email protected] 26 points 1 year ago (1 children)

Even if it was merged I'd be more concerned how on earth you have infinite Firefox tabs open

[–] [email protected] 25 points 1 year ago (2 children)

It's when you have more than 99 tabs open

[–] [email protected] 11 points 1 year ago (3 children)

What kind of psychopath has that many tabs open!?

[–] [email protected] 19 points 1 year ago (2 children)

I take personal offense to that. How do you not?

[–] [email protected] 2 points 1 year ago* (last edited 1 year ago)

I bookmark stuff I need at a later time, or will need again, and read the stuff I want to read now and close the tab when I'm done.

[–] [email protected] 1 points 1 year ago

I close all the tabs regularly. Bookmark for those that I need to save for longer than one session

[–] [email protected] 14 points 1 year ago* (last edited 1 year ago) (1 children)

I keep tabs open as a sort of "read page later" list. I never seem to get to reading them though.

[–] [email protected] 1 points 1 year ago

So do I, for a few days. If I haven't read it by then, I'll either bookmark for later or just close. I pretty much never have more than 10-15 active tabs ever.

[–] [email protected] 5 points 1 year ago (2 children)

I got to that once, on mobile I've never worked out the rule for when FF opens a new tab vs opening a site in your current tab. They just kind of silently accumulate.

[–] [email protected] 1 points 1 year ago

Yeah that's the problem I have, started while ago. It opens a new tab instead switching to existing tab.

[–] [email protected] 1 points 1 year ago (1 children)

Yeah it's a bit weird with FF, I just purge open tabs for unnecessary tabs daily.

[–] [email protected] 1 points 1 year ago (2 children)

There's a setting to auto-close tabs after a certain amount of time.

[–] [email protected] 4 points 1 year ago

"Oh no! What if I need it later"

~ me, more than 99 times

[–] [email protected] 3 points 1 year ago

I like to be in control of what gets closed and when, so nothing gets closed before I bookmark it if need it.

[–] [email protected] 8 points 1 year ago

As we know, scientists have not yet discovered any numbers past 99

[–] [email protected] 21 points 1 year ago (3 children)

Why did they submit this as a pull request in the first place? Just commit it to a WIP branch until it’s ready to merge. Am I missing something?

[–] [email protected] 30 points 1 year ago (1 children)

Probably to get some other benefitof the PR system, such as CI tests

[–] [email protected] 10 points 1 year ago (2 children)

Does gerrit have a draft state? In azure devops you can mark PR as draft , won't trigger any builds but you can still start them manually

[–] [email protected] 4 points 1 year ago

manually

This is probably why the dev created a PR, less clicks

[–] [email protected] 2 points 1 year ago

I don’t remember if it did when I used it. Our convention was to -2 your own change until it was ready to go 😅

[–] NotSteve_ 7 points 1 year ago

I do this often. It's useful if you want to send it to your coworker for some early feedback or as others have said, have the CI run

[–] [email protected] 4 points 1 year ago* (last edited 1 year ago)

It's been a while since I've worked with AOSP, but I had always understood it to be some weird shit with Google's internal processes. The "do not merge" commits are all over the AOSP, or at least they used to be.

[–] [email protected] 11 points 1 year ago (1 children)

There are a LOT of these in lineage repos. There must be a reason

[–] [email protected] 4 points 1 year ago

Maybe they dont use squash merges, so all the intermediate commits remain on-chain?

[–] [email protected] 9 points 1 year ago

That's why there are draft merge requests nowadays. Although I kinda miss the "DONT MERGE WE GONNA DIE" comments.

[–] [email protected] 4 points 1 year ago

Nice