Rebase all of your work branches onto HEAD so that conflicts require refactoring the first commit where things don't match up. This can make conflicts easier to deal with (in my humble opinion) since you deal with conflicts earlier in your commit history as opposed to at the end after ALL of your changes are made.
Plus a linear history is super nice to work with later on.
To clarify further though, the blame should rest almost exclusively on the shoulders of the oil companies, and they are desperate to deflect that blame, onto anyone but them.
Even without solar and wind (they were too expensive at the time)
This is true and I'm not disputing this fact, but had the oil companies not interfered with and killed off any attempts at alternative energy sources, things may have been quite different.
Except that even with biggest earthquake ever, that won't happen. The San Andreas fault is a strike slip fault, not a subduction one. At worst California will just move north, and not into the ocean.
I'm a green party supporter (not in the US) and couldn't agree more. I support the greens as much as I can to help spread environmental awareness, but if the election looks like it will be close, I vote for the party most likely to defeat the conservatives.
The Republican party is basically fucked because of this. Because until Trump goes away, they can't move on. And you'll never win a national election with him again.
They're perfectly ok with taking the whitehouse by force
Point taken and why I think any conflicts just need to be noted and weighed with the rest of the facts, as opposed to completely discarding someone's expertise.
You are literally bio-hacking your brain by doing this. It seems counterintuitive but your mood is partially controlled by a feedback loop in your brain, and smiling will essentially force other parts to get on board the happy train.
Rebase all of your work branches onto HEAD so that conflicts require refactoring the first commit where things don't match up. This can make conflicts easier to deal with (in my humble opinion) since you deal with conflicts earlier in your commit history as opposed to at the end after ALL of your changes are made.
Plus a linear history is super nice to work with later on.