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
I liked the idea so i asked bing to write a movie synopsis about it. What’s fascinating is that bing knew which xkcd comic i was referring to from my horrible description of it. Anyway, here’s next year mindless, generic Hollywood blockbuster action movie :
Server Down
Jack Bauer is a nerdy and obsessive system administrator who works in the basement of a high-tech skyscraper. He loves his servers more than anything else, and he will do anything to keep them running smoothly.
When a group of terrorists take over the building and hold the employees hostage, they cut off all communication lines, disable the security cameras, and demand a ransom from the government. But they didn’t count on one thing: Jack.
Jack notices that his servers are offline, and decides to take matters into his own hands. He crawls through the ventilation ducts, walks across broken glass, and kills anyone who stands in his way, just to reconnect his servers to the internet. He doesn’t care about the hostages, the terrorists, or the ransom. He only cares about his uptime.
But as he reaches the server room, he realizes that he has unwittingly become the only hope for the hostages. The terrorists have planted a bomb in the building, and they are ready to detonate it unless their demands are met. Jack has to use his skills, his gadgets, and his devotion to duty to stop them and save the day. He is the sysadmin, and he is the hero.
Server Down is a thrilling action-comedy that parodies the genre of Die Hard and pays homage to the geek culture. It is a film that celebrates the power of technology, the importance of passion, and the absurdity of heroism.
Firewall kinda-sorta plays with this idea, but all the tech is pretty stupid (and main focus, if memory serves, isn’t even in the technology). It’s not a bad movie as a hollywood 13-in-a-dozen action category, but it’s a far cry from “Server Down” we have here.
I like the idea but I think it would be more fun to reframe it as a thriller movie from the terrorist’s perspective. They’re being hunted down one by one by an angry sysadmin and they can do nothing to stop him.
This is starting to make sysadmins sound like John Wick.
“And then my son, a few days after his wife died, you steal his 3d printers and smash his fcking Apple 1.”
“The sysadmin will come for you, and you will do nothing because you can do nothing,”
It would be a great action comedy if the story was set in japan and the sysadmin used to be a feared yakuza member. Kinda like GTA (great teacher onizuka).
Bing Chat (so ChatGPT) wrote an opening scene (or maybe more like a trailer, prompt was opening scene) too:
The opening scene of “Server Down” begins with a shot of a high-tech skyscraper. The camera then zooms into the basement of the building, where we see Jack Bauer, a nerdy and obsessive system administrator, working on his servers. He is surrounded by racks of blinking machines, tangled cables, and humming fans. Jack is wearing a t-shirt with a witty tech joke printed on it, and he is sipping a cup of coffee from a “World’s Best Sysadmin” mug.
Suddenly, the lights flicker, and the servers go offline. Jack’s face turns pale, and he drops his coffee mug. He frantically tries to reboot the servers, but nothing works. He checks the network connections, the power supply, and the cooling system, but everything seems fine. He then realizes that the problem is not with his servers, but with the building’s infrastructure. He rushes to the security room, where he finds out that the building has been taken over by terrorists.
The camera then cuts to the terrorists, who are holding the employees hostage and demanding a ransom from the government. They have cut off all communication lines, disabled the security cameras, and planted a bomb in the building. They are confident that they can get away with their plan, but they didn’t count on one thing: Jack Bauer.
The scene ends with Jack staring at the security monitors, his eyes burning with determination. He knows that he has to act fast to save his servers, his colleagues, and himself. He takes a deep breath, puts on his backpack, and heads towards the ventilation ducts. The adventure begins!
programmer_humor
Oldest
This magazine is from a federated server and may be incomplete. Browse more on the original instance.