You can still merge the whole upstream branch manually with a local clone, and git will stop on each conflict for you to resolve them. Then when it’s done you can push the merged branch to your fork.

I use MKVtoolnix for reboxing files (naturally it outputs MKV). I would assume ffmpeg can do the slicing that you want but it’s just a library with a CLI. So if you search for ffmpeg GUIs you can probably find one to your liking.

Cheers!

I started my beehaw and ml accounts on June 2. This one and Lemmy.one are coming up on June 11. And my sdf.org account was on June 30. But this is the one that stuck 😁.

We use “my side” and “your side” so it’s always correct from any perspective.

Fuck yeah.

Can someone eggsplain this?

Sorry.

I love what Google did for recursion

https://www.google.com/search?q=recursion&oq=recursion

Baron is from Brian Blessed as Voltan in Flash Gordon yelling “BARINNNNNNNN” at Timothy Dalton, and not knowing it was spelled with an “i” instead.

I’ve run ChromeOS Flex on an old Surface Pro 3 and it was pretty good. However Flex doesn’t support the Linux containers or Android apps. I was tempted to try Fedora on it, but ended up trading it in as that battery wasn’t that reliable anymore. I think the Surface line is best option in the 2-in-1 space anymore. When I was looking at options last fall no other vendor really had anything under 13", which is just ridiculous to ever use as s tablet.

He doesn’t need anyone to arrest his opponents. He just needs the fervent MAGA base to be whipped up into a frenzy like on Jan 6th. To be so angry if no LEO arrests Trump’s opponents that they go out kill them, because hey it’s totally cool now because Trump’s a dictator.

Slackware. 3.x. I was studying computer science and wanted to have a similar system at home as in the lab.

Jeflon Buskos.

And some airports are cheaper than others. My last international flight was 2x the cost to fly out of Houston (IAH) vs out of Austin. Even for the flight that went from Austin to Houston and then to the destination.

I still use “baby steps onto …” all the time. And “is this some radical new …?” too, but not nearly as much.

Yeah Leo was the protagonist here.

Dropoff and pickup lines aren’t new. They were already a punchline in Mr Mom (released in 1983).

Off to read the article.

Oh shit

Wife and I still use that line and “two minutes” quite regularly.

That many SJ’s seems too deliberate! It must be deeper than that! #Hooters

Is LMFHSJSJSJD a thing? Laughing my ducking hooters …

Google seems to have my back on this one.