![](/static/66c60d9f/assets/icons/icon-96x96.png)
![](https://lemmy.world/pictrs/image/8286e071-7449-4413-a084-1eb5242e2cf4.png)
I’m in the 1%
I’m in the 1%
Boom, merge conflict. The only thing left to me is force push and delete everyone’s changes.
Sometimes my work takes a while and other people push in the meantime. Guess I’m dying the fire.
Fine but whatever you think about js, dynamic languages have certain advantages, and trying to turn it into another java or c# is a stupid endeavor. You’re not “fixing” javascript by making it more like java.
My comment was obviously devoid of any nuance, I am on programmer humor after all. I actually do use typescript, but I think fixing issues in application code that isn’t used by other code is a waste of time. I also think there are lots of advantages of a very dynamic language, like usable REPLs and much easier debugging. We can take these advantages way further by embracing the dynamic nature of javascript, like how lisps do it for example. But instead, everyone is happy going down the route of turning it into another c# (nothing against c# but we don’t need all languages to be c# and java).
I prefer to think of it as maybe don’t shoehorn a shitty type checker into a dynamic language. Honestly I think people who get excited about typescript should fuck off and go write java instead.
The way allah intended
I get the sentiment, but most places don’t have even halfway decent coffee shops. Everyone gives starbucks shit (rightfully so), but the fact is if you walk into a random cafe in America, it will most likely be inferior to starbucks. The level of quality in American coffee is just abysmal. And if you’re traveling, you won’t know if the cafe you take a chance on is a hidden gem (spoiler, it never is). I was in Austin one time and I found this hipster place that had great reviews on google. The interior was really nice, nice place to work, spacious, etc. The coffee tasted like dog water. It wasn’t mediocre, it was trash. I’m sure Austin has great cafes, but unless you live there how will you know? Starbucks is a consistent mediocre coffee.
What is why? What is the solution we’re trying to solve?
Lemmy being imperfect doesn’t change the fact that it does solve one big problem: it takes the big corporation and its influences out of the equation. It is not possible for a centralized solution to do this.
Right but it would be an even better alternative if you had the choice who to block.
Btw blocking instances at the user level is a feature that will be coming to lemmy soon.
“Reapply” is rewriting it on the other branch. The branch you are rebasing to now has a one or multiple commits that do not represent real history. Only the very last commit on the branch is actually what the user rebasing has on their computer.
Always merge when you’re not sure. Rebasing rewrites your commit history, and merging with the squash flag discards history. In either case, you will not have a real log of what happened during development.
Why do you want that? Because it allows you to go back in time and search. For example, you could be looking for the exact commit that created a specific issue using git bisect. Rebasing all the commits in a feature branch makes it impossible to be sure they will even work, since they represent snapshots that never existed.
I’ll never understand why people suggest you should default to rebasing. When prompted about why, it’s usually some story about how it went wrong and it was just easier to do it the wrong way.
I’m not saying never squash or rebase. It depends on the situation but if you had to pick a default, it should be to simply merge.
That is absolutely not what rebasing does. Rebasing rewrites the commit history, cherry picking commits then doing a normal merge does not rewrite any history.
Does windows not have the concept of “recents” so you can find things you were just messing with easily
As someone who uses Django every day, I can tell you that the code is almost secondary to the amazing documentation. The documentation is such a core part of a framework that I don’t see how it can be usable without really good and up to date documentation.
The fact that spring boot’s documentation is so bad that it’s impossible to even find a reference for a class you’re using is, I’m sorry to say, garbage.
I know some people don’t have the choice but if you do, please choose something better. That garbage does not deserve your effort.
Alternative plan: why not use gecko? I know it’s more work to do so, but I would call that the lesser of two evils at this point.
I watched a few of his videos and I don’t get it
Yeah I guess it was hyperbole but I wasn’t sure
JS formatters add them if the project requires it