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

help-circle







  • Censorship sucks and I can’t believe we let an entire country get away with it and still did business with them the whole time.

    It is not clear to me that the country would be less censored now and the people there better off if we had refused to do business with them.

    (Just to be clear, I am not saying that we handled China as well as we could have over the last few decades, but hindsight is 20-20.)









  • 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.