Merged
You must log in or register to comment.
- 2 years
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.
- 2 years
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
- 2 years
Out of curiosity, any idea what automerger they use? I have always been on the lookout for one for hobby projects.
- 2 years
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.
- 2 years
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.
- 2 years
Even if it was merged I’d be more concerned how on earth you have infinite Firefox tabs open
- 2 years
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.
- 2 years
I close all the tabs regularly. Bookmark for those that I need to save for longer than one session
- 2 years
I keep tabs open as a sort of “read page later” list. I never seem to get to reading them though.
- 2 years
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.
- 2 years
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.
- 2 years
Yeah that’s the problem I have, started while ago. It opens a new tab instead switching to existing tab.
- 2 years
Yeah it’s a bit weird with FF, I just purge open tabs for unnecessary tabs daily.
- 2 years
“Oh no! What if I need it later”
~ me, more than 99 times
- 2 years
I like to be in control of what gets closed and when, so nothing gets closed before I bookmark it if need it.
- 2 years
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?
- 2 years
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
- 2 years
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 😅
- 2 years
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
- 2 years
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.
- xia@lemmy.sdf.orgEnglish2 years
Maybe they dont use squash merges, so all the intermediate commits remain on-chain?
- 2 years
That’s why there are draft merge requests nowadays. Although I kinda miss the “DONT MERGE WE GONNA DIE” comments.
