Reminds me of a Wild Thornberrys episode I saw when I was a kid where they fell off a boat and needed to cross a mountain to catch it on the other side.

Damn she has a ton of these helpful tech guides on her site under “Comics”.

I mean I would too. Capitalize on the shitty injustice you were given. He deserves it.

Are you saying he hired the police?

I use a Java backend with a React frontend at work. It works fine with us and it’s not going anywhere anytime soon.

Oh good as long as it’s only a recent update.

What. Da fuck. This always existed?!

I can open .docx just fine with LibreOffice.

In what way is it not? It has a desktop, a browser, free app for a word processor. For the CASUAL user it’s fine. Just don’t go into the terminal, like you wouldn’t for the command prompt.

That’s why I’ve been using Emby. Works just fine for free.

Ah good catch

That’s like saying “we can cover this switch on the wall that will blow up your house so you can’t flip it.” I would feel better if the switch wasn’t even there. And now I’m wondering what other switches exist in my house that I don’t know about. The trust has already been shattered and I’ll never feel safe.

Adobe also recently snuck into their ToS that they could use whatever you made with their products for training AI and then gaslit everyone saying “we never said that” and changed their ToS. You know where you can’t access my stuff? Offline.

That’s about as far as I memorized it. What’s your method? I picture batches of 2 digit numbers on a number line.

I really thought you were going to mention “Upload” on Prime. Same creator as the office.

Clearly we need Garfield in here then.

At work I have two monitors. One for input (my IDE for programming) and one for output ( the browser to watch changes for my react app).

At home I bought the 49 in. Samsung and have three monitors. Third is normally the log output.

It inserts the master changes before the task branch ones.

Kind of. Both merge and rebase result in the branches “synced up” but they do it in different ways.

Merge is making a batter for cookies, having a bowl for dry ingredients (task branch) and a bowl for wet ingredients, (master branch) making them separately and then just dumping the dry bowl into the wet bowl (merge).

Rebase is taking a time machine back to before you started mixing the dry ingredients, mix all the wet ingredients first then add the dry ones on top of that in the same bowl.

It’s really hard to create an analogy for this.

Merge is taking all the code from the master branch and combining it with the task branch, resulting in a commit for just the merge itself.

Rebase is “re-basing” where your task branch was created from off the master branch. It essentially takes all the commits from master that happened since you branched, REWRITES THE HISTORY of your task branch by inserting those master branch commits before all your existing commits, and effectively makes your task branch look like it was branched yesterday instead of like 4 weeks ago. You changed where your task branch originated on the master. You moved its base.

Atlassian does a fantastic writeup on this.