Merged
But thanks for keeping my phone up to date, it is appreciated ♥
DO NOT MERGE
Submitted 10 months ago by leds@feddit.dk to programmer_humor@programming.dev
https://feddit.dk/pictrs/image/c1498b01-ca0a-4e58-9ecd-304d99dd2526.webp
Comments
leds@feddit.dk 10 months ago
infinitevalence@discuss.online 10 months 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.
DreadPotato@sopuli.xyz 10 months ago
It’s really annoying that updates consistently breaks banking apps and other stuff relying of passing safetynet. Every time I update I have to do the Mavis km workaround again which is really annoying.
sneaky_hecker@lemmy.world 10 months ago
Even if it was merged I’d be more concerned how on earth you have infinite Firefox tabs open
lone_faerie@lemmy.blahaj.zone 10 months ago
It’s when you have more than 99 tabs open
DreadPotato@sopuli.xyz 10 months ago
What kind of psychopath has that many tabs open!?
ripcord@lemmy.world 10 months ago
As we know, scientists have not yet discovered any numbers past 99
aMockTie@beehaw.org 10 months ago
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?
brisk@aussie.zone 10 months ago
Probably to get some other benefitof the PR system, such as CI tests
leds@feddit.dk 10 months ago
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
NotSteve_@lemmy.ca 10 months 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
DrJenkem@lemmy.blugatch.tube 10 months 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.
ryannathans@aussie.zone 10 months ago
There are a LOT of these in lineage repos. There must be a reason
xia@lemmy.sdf.org 10 months ago
Maybe they dont use squash merges, so all the intermediate commits remain on-chain?
UnfortunateShort@lemmy.world 10 months ago
That’s why there are draft merge requests nowadays. Although I kinda miss the “DONT MERGE WE GONNA DIE” comments.
voight@hexbear.net 10 months ago
NegativeLookBehind@kbin.social 10 months ago
Nice
cornshark@lemmy.world 10 months ago
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.
leds@feddit.dk 10 months 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
CodeMonkey@programming.dev 10 months ago
Out of curiosity, any idea what automerger they use? I have always been on the lookout for one for hobby projects.