• 0 Posts
  • 24 Comments
Joined 7 months ago
cake
Cake day: December 9th, 2023

help-circle






  • Yes. My rule of thumb is that generally rebasing is the better approach, in part because if your commit history is relatively clean then it is easier to merge in changes one commit at a time than all at once. However, sometimes so much has changed that replaying your commits puts you in the position of having to solve so many problems that it is more trouble than it is worth, in which case you should feel no qualms about aborting the rebase (git rebase --abort) and using a merge instead.


  • The way I structure my commits, it is usually (but not always) easier and more reliable for me to replay my commits one at a time on top of the main branch and see how each relatively small change needs to be adapted in isolation–running the full test suite at each step to verify that my changes were correct–than to be presented with a slew of changes all at once that result from marrying all of my changes with all of the changes made to the main branch at once. So I generally start by attempting a rebase and fall back to a merge if that ends up creating more problems than it solves.






  • Yes, of course they have complained to the courts. That’s not the point.

    That is moving the goalposts. In your other comment, you said, “What is the FTC going to do about it? Most likely do nothing, or issue a stern warning.” I have demonstrated that they are doing neither of these things but instead are going through the courts to get injunctive relief.

    This simply will go nowhere, or do you expect that the court will somehow separate Activision out of Microsofts hands again to fix this?

    If the appellate court decides that the lower court erred in its reasoning, then there is no reason why it could not issue such an order. It is not like this would be the first time that the government broke up a company.

    Or punish the managers at Microsoft and make them withdraw the execution plan to remove redundant jobs?

    There is no reason why the court could not issue an injunction preventing it from executing this plan until the proceeding concludes.

    At the end of it, Microsoft will eventually pay a small, symbolic sum which they consider “cost of conducting business”. Nothing more.

    If the FTC considered this to be a sufficient remedy then they probably would have settled with Microsoft by now rather than taking this to the courts.





  • The explanation given to you makes it sound like == was deliberately designed to be a more convenient version of ===, but what actually happened was that == used to be the only equality operator in JavaScript, which meant that if you didn’t want it’s auto-coercing behavior then you needed to go out of your way to add additional type checks yourself. Because this was obviously a tremendously inconvenient state of affairs, the === operator was introduced later so that you could test for equality without having to worry about JavaScript doing something clever underneath the hood that you weren’t expecting.



  • Land mines are painted red in my shop. You want to change the language to remove a land mine that everyone competent already knows enough to step around. The problem has already been solved, so why are you continuing to complain about it?

    Just to be clear, I’m not actually calling for JavaScript to change, I’m just pointing out that people are right to point out this as being a problem. Having said that, if everyone competent uses linters now so that this feature isn’t used in practice anymore, then getting rid of it shouldn’t even break anything, and arguably code which would break is already broken because it uses an operator that no one should be using, so you shouldn’t be using this code anyway.