That's a bummer. The first season was good... Except that bottle episode... Can TV just stop doing bottle episodes?
erogenouswarzone
joined 1 year ago
Also, a way to never have to work again!
I hear what you're saying.
First, I hard disagree with you. Overwriting my local version of code is a parachute - not an ideal landing, but better than merging by hand.
Also, my comment was not an attempt to teach everything about git, just to explain what is happening in simple terms, since git requires a lot of experience to understand what those messages mean.
Great meme, and I'm sure op knows this, but for anyone else who is curious...
007 in theory means:
- 00: you have already committed your code to your local code base
- 7: When you try to merge your code with everyone else's there are 7 files that others have worked on since you last refreshed your local code base.
To resolve this, you need to go file by file and compare your changes with the changes on the remote code. You need to keep the changes others have made and incorporate your own.
You can use git diff file_name to see the differences.
If you have made small changes, it's easier to pull and force an overwrite of your local code and make changes again.
However multiple people working on the same files is usually a sign of organizational issues with management. Ie, typically you don't want multiple people working on the same files at the same time, to avoid stuff like this.
If you're not sure, ask someone that knows what they're doing before you follow any advice on Lemmy.
If you don't have apt backups, that is a failure of the process, not yours.
You can also do this by forgetting a WHERE clause. I know this because I ruined a production database in my early years.
Always write your where before your insert, kids.
Speaking of Java RipS. How annoying is it the JS has left Java in the dust as far as looser standards?
Developing in Java: YOU FORGOT A SEMI-COLON ARE YOU CRAZY?! HOW IS THE COMPILER SUPPOSED TO KNOW WHAT TO DO?!
Developing in JS: Who gives a fuck about semi-colons?
I love js. But the date object has always been a total pain. Moment.js is a good package to deal with it, but yeah, it's currently deprecated, but it would be nice if it or something like it became part of ECMAScript.
I have no idea why it hasn't yet, except that it might be that js needs to work for everyone, not just the us. So time is not standard.
I feel like Creed is this for me. I started really getting into it ironically, now I fucking love it unironically. My music snob friends will not even acknowledge it's funny. Joke's on them.
Fuck. That was my interest.
It eventually gets absorbed by the pasta and makes it creamier. Unless you have too much water.
This is giving me stress daymares about Spanish in high school.
Still, it's an interesting point you make.
But then again, with definitive articles you have a bunch of things that are not supposed to convey gender conveying gender. Like a toaster... It would suck to have to remember the gender of a toaster, or, well toasters in general.