DO NOT MERGE (feddit.dk)


top 33 comments
sorted by: hot top controversial new old
[-] cornshark@lemmy.world 83 points 3 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 16 points 3 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 1 points 3 months ago

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

[-] leds@feddit.dk 47 points 4 months ago

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

[-] infinitevalence@discuss.online 15 points 4 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 1 points 3 months ago* (last edited 3 months 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.

[-] sneaky_hecker@lemmy.world 27 points 3 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 26 points 3 months ago

It's when you have more than 99 tabs open

[-] DreadPotato@sopuli.xyz 12 points 3 months ago

What kind of psychopath has that many tabs open!?

[-] CrypticCoffee@lemmy.ml 20 points 3 months ago

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

[-] DreadPotato@sopuli.xyz 2 points 3 months ago* (last edited 3 months 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.

[-] Kusimulkku@lemm.ee 1 points 3 months ago

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

[-] poplargrove@lemmy.world 14 points 3 months ago* (last edited 3 months ago)

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

[-] DreadPotato@sopuli.xyz 1 points 3 months 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.

[-] Daeraxa@lemmy.ml 5 points 3 months ago

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.

[-] DreadPotato@sopuli.xyz 1 points 3 months ago

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

[-] loutr@sh.itjust.works 2 points 3 months ago

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

[-] mexicancartel@lemmy.dbzer0.com 5 points 3 months ago

"Oh no! What if I need it later"

~ me, more than 99 times

[-] DreadPotato@sopuli.xyz 3 points 3 months ago

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

[-] leds@feddit.dk 1 points 3 months ago

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

[-] ripcord@lemmy.world 8 points 3 months ago

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

[-] aMockTie@beehaw.org 21 points 4 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 30 points 4 months ago

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

[-] leds@feddit.dk 10 points 4 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

[-] beeng@discuss.tchncs.de 4 points 4 months ago


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

[-] sf1tzp@programming.dev 2 points 3 months 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_@lemmy.ca 7 points 3 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 5 points 4 months ago* (last edited 4 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 11 points 3 months ago

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

[-] xia@lemmy.sdf.org 4 points 3 months ago

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

[-] UnfortunateShort@lemmy.world 9 points 3 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 8 points 4 months ago
[-] NegativeLookBehind@kbin.social 4 points 4 months ago
this post was submitted on 18 Jan 2024
243 points (96.6% liked)

Programmer Humor

17608 readers
555 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.


founded 11 months ago