Holy shit! I never took the time to read about it rerere. But it all makes sense now.
However, it’s still a lot of extra steps for what could otherwise be really simple with a regular merge.
Is there really a big advantage in using rebase vs merge other than trying to keep a single line of progress in the history? It’s it really worth all the hassle? Especially if you’re using a squash merge in a pull request…
I consider myself above average in terms of Git know how. But I’ve come across situations using rebase where you’re stuck resolving the same conflicts over several commits.
I still don’t understand that part quite well.
This doesn’t happen when you do a normal merge though. Making it easier to manage
You’re right.
Besides, following the elections process, their whole process is based on a cult of personality. Not just Trump, but every candidate. Kamala, her VP candidate, etc. You see them in these big conventions with huge crowds of people holding up signs and spokespeople cheering them on. It’s like they’re celebrities. It’s fucking wild. You don’t see this in any other country. (Thankfully)
It’s honestly scary. Politicians shouldn’t get this kind of celebrity status. Politics should be something that regular people can get involved in to improve society through collaboration. Not something reserved for nepo babies who rise to fame because of their name or heritage. It should be something accessible to the average Joe.
At this point the real problem is we ain’t getting paid well enough.
Most of the revenue that people/businesses made this year has been from capital gains. Not actual profit from selling products or services.
Canada needs to tax the fuck out of these and provide a universal basic income to allow the population to have the means to pay for shelter and food.
ISO 8601