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.
We use "my side" and "your side" so it's always correct from any perspective.
Can someone eggsplain this?
Sorry.
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.
Is LMFHSJSJSJD a thing? Laughing my ducking hooters ...
Google seems to have my back on this one.
Yeah we try to keep at least three in both cars at all times to avoid that!
US grocery chains all push their own brands, and if they called out shrinkflation they wouldn't be able to get in on it themselves.
Who throws out reusable bags after 5? I've had the same set of cloth bags for like 15 years!
Generally no. It's just a straw man the right wing trans phones have cooked up to rage-bait voters. Just like post-birth abortion.