Skip Navigation

Programmer Humor @programming.dev

leds @feddit.dk

1y ago

DO NOT MERGE

Merged

33 comments

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.
- 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
- Out of curiosity, any idea what automerger they use? I have always been on the lookout for one for hobby projects.

But thanks for keeping my phone up to date, it is appreciated ♥
- 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.
- 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.

Even if it was merged I'd be more concerned how on earth you have infinite Firefox tabs open
- It's when you have more than 99 tabs open
  
  What kind of psychopath has that many tabs open!?
  
  As we know, scientists have not yet discovered any numbers past 99

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?
- Probably to get some other benefitof the PR system, such as CI tests
  
  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
- 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
- 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.

There are a LOT of these in lineage repos. There must be a reason
- Maybe they dont use squash merges, so all the intermediate commits remain on-chain?

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

Nice

33 comments