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”

Only eggs can sustain me

Cats are toddlers that can reach the ceiling

Can we never joke about sensitive topics?

Isn’t humor like, our primary coping mechanism for dealing with dark topics?

Maybe the light in the dash was shorting, causing the light to turn on on its own

And screaming was juuuust enough to cause the short to break connection?

It’s either that or ghosts

Coffee brewers that have a hot plate under the carafe will burn and ruin coffee. The best method of keeping coffee fresh is to keep it in a sealed container (like a double walled carafe with a lid)

Microwaving coffee is actually a pretty decent way to re-heat it, but the taste will depend on how fresh it was kept prior

Shell scripts don’t count

That’s not a programming language, that’s hieroglyphs

Darn autocorrect

I usually have it disabled, but I’ve been too lazy with the new phone

IIRC, it was actually Webster, who was writing the dictionary, decided to simplify spelling

A large amount of spelling differences between the US and UK like mould/mold and center/center, are due to him

For lurkers hoarding high quality content for this community, this is your sign to press the button “New post”

I’ve never really had good ideas to post

Even on reddit

I don’t understand non-mammalian pets

Why have a tarantula that you just look at, instead of a Golden retriever to goof off with?

I pay for spoofie premium because it’s convenient

But I’m not defending this money-grubbing behavior

I just started using Spotify for the first time last year, mainly because I got tired of trying to figure out what this meat paste wanted to listen to

YT is great when you know what you want to hear, but it’s garbage at (music) recommendations (I haven’t tried YT music)

Spoofie isn’t the best, but for right now, it’s worth the price just so I can actually get back to work, and not fiddle with YT for 3 hours looking for music this meat paste wants right now

Although, I’m open to alternatives, if they’re viable

I was in high school during that time

It’s really weird to see actually witness history becoming “history”

Just shot this pic

What’s the likelihood of a reattempt, if the first shot wasn’t fatal?

I’m not sure many people would be capable of doing so, given how addled they’d likely be

Every night, one of my cats yells at me, until I give her brushes and attention

I love RafVicAlv’s comics

Is there a c/imSorryJohn ?

I wonder if KDE connect could leverage the way Syncthing does device discovery and pairing

It works across networks, with no configuration