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.
ChromeOS, powered by Mr Fusion.
but it won’t end the blue/green bubble nonsense.
This is why I use virtual credit card numbers for everything online.
Third parties in the US will never be a reality without election reform. That in turn will have to be preceded by high voter turnout to push state legislatures more progressive.
We use “my side” and “your side” so it’s always correct from any perspective.
Well color me jelly. That’s like actually usable and shit.
wait, really? For me on Windows 11 the launcher right-click literally just has one entry: Firefox. Nothing for recent/frequent/open tabs. Nothing for opening a new tab or window. Nothing for Private. Just that one entry that does the same thing as just clicking the launcher. There’s a separate start menu item for private browser window, I could pin that on the taskbar next to the regular launcher.
And what’s different from the current profile manager.
From a usability standpoint, what current profile manager? Having to web search to find out how to open it puts it beyond the reach of most users.
Based on other comments the operative comparison is the previous worst case took 55 years to build up the level of CO2 that now only takes 5 years.
F’ing Lightroom, man.
I don’t think ESPN cable would be affordable to most people without bundling it into cable packages
Then it’s not a viable network.
their TV is subsidized by every non sports watching household.
But that’s exactly why people started ditching cable in the first place. They wouldn’t be bundling ESPN with non-sports channels, they would bundle other less popular sports channels with ESPN so they can jack up the price because ESPN. But ESPN doesn’t carry the sports I follow, and I can’t get the network that does without paying double because it’s in a bundle with ESPN.
Bundling is only cheaper if I actually want all of the bundled things, but that’s not how companies like Comcast bundle things.
Network neutrality became policy after Comcast, Verizon, and ATT were all caught throttling Netflix while their own competing services were lagging behind in market share. It was a response to a real problem that was harming competitors and consumers.
I love what Google did for recursion
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.
Right. Not about to use public WiFi naked!
This feels relevant
.
Sometimes the mods of overlapping communities will discuss merging, usually initiated when one of them notices there is little engagement in their own. But the general consensus in the Lemmy admin/mod population is that having overlapping communities on different instances is a net benefit.