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 play guitar, watch USMLR and NHL, occasionally brew beer, enjoy live music and travel, and practice sarcasm.
Mastodon - @baronvonj@mas.to
Pixelfed - @baronvonj@pixelfed.social
kbin - @baronvonj@kbin.social
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.
the stupid thing is I still have my children and I adding our MS accounts after creating the local accounts, because I like setting the parental limits once for all the computers. I just can’t stand the stupid email-based usernames it creates when signing into the MS account during account creation.
but it won’t end the blue/green bubble nonsense.
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 😁.
This is why I use virtual credit card numbers for everything online.
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.
The shittiest of enshitifications.
“Your device has been rooted and therefore cannot be supported.”
Lemmy doesn’t have a feature to follow users, last I checked.
Slackware. 3.x. I was studying computer science and wanted to have a similar system at home as in the lab.
Yeah it’s not like christians saying it’s a sin for a woman to deny sex from her husband and therefore spousal rape doesn’t exist. Or christian pedophiles being relocated by the church to avoid prosecution. Or mormons grooming teenage girls to be their 14th wife.
Well that’s just too easy an answer! Thanks. I thought I had moved the community much earlier in the timeline than that.
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.
Dropoff and pickup lines aren’t new. They were already a punchline in Mr Mom (released in 1983).
Off to read the article.
You have a way with words.
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.