I mean, you just need to look at the conflicting files, fix up the code, then stage those changes and pop a new commit

There’s no “special” merge conflict resolution commit “type”

As for fixing the code itself, I usually look at what changed between both versions, and then re-author the code such that both changes make “sense”

OwO

“I’m sorry Dolores, I must not tell lies”

As a software dev, i like having 3. Gives me space to see

• console output and debug info on the left
• my code editor in the center
• and my browser on the right

Or having multiple vscode windows and a browser

I also move windows around using the keyboard (win + left / right), and the task switcher (alt + tab)

Did someone actually find a backdoor in Recall, or is this just the usual “M$ is evil” posting?

(Either way, fuck Recall Security Exploit Centrap)

My New Year’s Resolution is to never make a resolution

Relevant video essay about facebook

My source is that I made it the fuck up

Use a towel

Just make sure it’s not damp, or the resulting steam will burn you

You called?

I’ve done this by accident a few times while reading a really good book

The following day sucks big time, especially if you have to go to work

I don’t understand spelling bee’s, never have

Just watching this is setting my spine on fire from social anxiety

You might be able to clear (or at least relieve) some of the pressure by doing a Eustachian Tube Massage

Apply pressure to the area below the ear and just behind the jaw bone, then follow the jawline down to the neck (I’m not sure if you go under the jaw or straight down the neck. I do both)

Obviously, if this causes pain, don’t continue

(I am not a doctor)

It might be your phone getting a notification, and sending that to the BT speaker, which then takes precedent over the laptop

I usually just disable BT on my phone when stuff like that happens (on android, you can change the playback device without disconnecting, and that should also prevent the phone from stealing your headphones)

You got a purty mouth

If you use any kind of ad blocker, switch to FireFox

Chrome is deliberately crippling ad block extensions via manifest v3

This smells of bot/troll account

Maybe some reddit mod or admin taking the piss?

Lol

To be fair, i think making an effort to de-radicalize and deescalate american politics would go a long way

I don’t watch Mr Beast, nor do i know anything about him, but my gut says he’s not a good fit for this purpose

I don’t know, i just wish politics wasn’t such a cult-of-personality, us-vs-them scream fest. I just can’t be bothered to care when everyone is at each other’s throats over everything

I like Reddit / Lemmy’s system best

Auto up vote your own stuff (or just don’t allow self voting, same difference), and being able to see both up and down votes separately

Although i think the latter isn’t a thing on Reddit