Shame youtube removed the like/dislike ratio which we previously used for mass protest against video authors for their wrongdoings. Channels can now shovel shit onto us with no public humiliation inflicted on them in return.

I guess your sense of correct grammar is different from mine. “Fuckin’ Strait” isn’t a proper noun. He’s also using excessive punctuation.

Disclaimer: it’s been a while since I’ve used git.

You’ll be unable to push if the remote branch has diverged since you pulled because someone else has pushed changes different from your own.

One way to resolve this is to run git pull. If your commits have made changes to a file and the diverging commits have made changes to the same file, then you’ll have a conflict and git will put your local repo into a special merge conflict state. Your working files involved in the conflict will be automatically changed to include the differing changes, delimited by <<<, ===, and >>> characters. You’ll have the option to abort the pull or edit the files, git add them, and then git commit which completes the pull. You can then push.

git pull will do git fetch to update your copy of the remote branch, followed by a git merge. The documentation for resolving merge conflicts is contained in the git-merge man page: git help merge, particularly in the sections entitled “Pre-merge checks”, “How conflicts are presented”, and “How to resolve conflicts”. Side note: the man page will open in the system pager, in which typing /conflict and the keys n and N will step through each occurrence of the word “conflict”. Oh, you can even read it in glorious PDF.^[1]

Running git pull when you have uncommited files may be a different story entirely. Best to not do that. You can check whether your working files are clean with git status. It seems like the “proper” way to deal with this situation, if you must, is with git stash. That supposedly can be used to save your uncommited changes, cleanup your worktree to prepare it for a pull, and reapply the saved changes after.

I recommend sections in the free Pro Git book if your want something more pedagogical than the man pages.

picard.jpeg

It’s from the Polandball subreddit, so the degree to which Dutch looks like a mix of the two in the comic may be exaggerated. The characters are speaking their foreign language whilst mixing in enough English to be understandable.

Neither 867:5309:: nor 867::5309 appears to be allocated. Do IPv6 blocks work like car license plates where you can pay more to get a vanity plate of your choice or do you just get what you get?

One possible way to deal with this and very nearly return to the former freedom-to-tinker status quo is to send the bank your custom OS along with a computer-checkable formal proof that the bank’s app, while running on your OS, behaves as it would be expected to under the stock OS. With homomorphic encryption, it might be possible to do this without revealing your custom OS, only its one-way hash. The bank can then verify that the proof is correct and then accept transactions with attestation from your custom OS. This would enable installing a custom ROM that can be used for online banking without having to go through some cabal/consortium. The only caveat is something of this magnitude has never been done before. It’s a research project for sure. It would take many man- and compute-hours. But it would be very cool.

https://danluu.com/diseconomies-scale/

Please share.

I’m sure they tested the new recipe on a sample audience long before they put it into mass production which informed them that the recipe change would positively impact their bottom line. Big companies don’t make enormous blunders which put them out of business. The social media tech companies we all hate are still around and have billions of users after all the crap they did. Why? Because all of the negative changes they made to their platforms were first tested on a sample of users and the sample kept using it. After all of the recipe downgrades and shrinkflation, you still see the products on the shelves. The only time you ever see an established brand suddenly vanish is when they’re bought out by private equity or they’re made obsolete by new technology.

https://www.lexaloffle.com/bbs/?cat=7&carts_tab=1#sub=2&mode=carts&orderby=featured

I’ve spent more time than I care to admit reading Wikipedia entries on significant people from past centuries. Way too often their life story is full of disease and death. A dozen siblings. All of them suffer the same disease in childhood. Half of them don’t make it to adulthood. Mother dies during childbirth. Father struggles making money from their creative work, dies in a duel. Subject cared for by wealthy uncle. Is affected for the remainder of their life by the lingering effects of the childhood disease. Repeat for the next generation.

https://boingboing.net/2011/12/27/the-coming-war-on-general-purp.html

https://fmhy.net/gaming#rom-sites

It wouldn’t be necessary for IA to go under. If push came to shove, they could just downsize and be forced to decide what to delete. They’re probably sort of already doing that but for stuff they have not yet archived. What do you acquire verses what do you delete.

Anyone have a more in-depth technical description of how that works? I’m interested.

Looks like it’s only available in the U.S., Canada, and some island countries.^[1] That sucks. Here it is on PreserveTube.

You wouldn’t download a new car each time you want to download a new car.

The NoScript extension will properly do this. The extension blocks domains from running scripts except those you’ve whitelisted. There’s a drop down that displays a list of domains from which the page wishes to run scripts. It makes much of the web a pain to use, though. I sometimes have to go through a loop of whitelisting a subset of domains which want to run followed by a page refresh until the page works. Javascript is often not optional. If you had to live like Richard Stallman professes you should, you’d probably have to join the Amish.

People became oversaturated with alien stuff. It became unfashionable to believe in aliens and the millionth “aliens invade” movie isn’t interesting.