Finally, a very concise and straightforward explanation of git merge vs. rebase. This is clearest, simplest explanation I have seen on this confusing topic. It’s also very practical with simple how-to’s, pros and cons.
I used to think of casual friendships as sort of calculating and shallow. Especially way back in high school, it seemed like having lots of friendships was a way to “collect” friends and just try to look cool. So I revolted and embraced only a few close, genuine friends. In fact, I still play video games every weekend with my elementary school friends from 40 years ago. And of course I’m so glad to have them.
But now after a few life adjustments, I’m finally learning that, as with self-confidence, I had things backwards. It’s okay and not shallow to make friends with random people (“neighbors, a barista at the neighborhood coffee shop or fellow members in a spin class”)! It’s fun, and people like it. ๐คท๐ปโโ๏ธ (What was I thinking?)
These two article are a good reminder that it’s good to just be a silly occasional friend with people.
โTake a ton of pictures, text your friends stupid things, check in with old friends as often as possible, express admiration to co-workers, and every day, tell as many people as you can that you love them.”
By the way… It’s not always easy doing this as a single, middle-aged guy. But it can be done. Women in particular may think you’re trying to pick them up. And maybe you are. It gets ambiguous. But that can be part of the fun. ๐
A 2014 study found that the more weak ties a person has (neighbors, a barista at the neighborhood coffee shop or fellow members in a spin class), the happier they feel.
If I ever get to Manchester, and this place is actually open, I know where I’m going to get my exercise. In fact, I’d love to do a swimming pool / lido / bath / spa tour of the UK. Who’s down?
If I ever get to Thailand, this temple is on the top of my list. I had never heard of the Wat Samphran Temple until it showed up on my Instagram feed with this amazon drone pic.
The whole building is a temple with a dragon wrapped around it. You can get to the roof in an elevator (when it’s working) or climb your way up inside the dragon. It kinds of looks like a Vegas tourist trap, but it’s a legit Buddhist temple.