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

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?!

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.

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

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.

Worcestershire - so no one can pronounce my name.

Emby

Or a niece, Eric Matthews.

Now add the EU.

I have never seen home screen ads on mine…

Only thing I see is the continue prompt before watching

I rarely click on them. If I like what I see I’ll manually Google the product since I don’t trust the link they give me.

I wanted to use words a layman would know.

It’s the cleaning up of code by making it easier to read or rewriting something in a less convoluted way. Originally you just wanted it to be done quick so you coded it in a sloppy way. Now you have “debt” that needs to be fixed. You don’t really gain anything by cleaning it, so it wastes your time instead of implementing something new.

You notice people? Even on Reddit I never noticed people’s names when they comment.