Tag: Merge

Why I Prefer Regular Merge Commits Over Squash Commits

“Wow, that’s so cool!” I’ll always remember seeing my first squash commit. When I first joined a large engineering organization with more than 200 members, the squash commits were the first thing I noticed. To me, the consistent use of squash commits across the compa...

Ethereum’s Merge May Have Opened a Regulatory Nightmare

Traditionally, the same thing that made cryptocurrencies into pariahs also made them unique. Bitcoin, Ethereum and other first-generation tokens relied on Proof of Work to run their blockchains, a labor-intensive mathematical process that consumes obscene amounts of electrical power. While their ...

Quitting Merge Dragons and addictive smartphone games

I sit on the train going over the Williamsburg bridge on my way back home to Brooklyn. Just outside the window, the New York City skyline and a million twinkling lights are passing in view: Over 60 million tourists come to the city every year just to get views like this. But I don’t loo...

San Juan de Chamula, where Indigenous spirituality, Catholicism, and capitalism merge

“There is a church, it is the most interesting place you will visit during your time in Chiapas, Mexico”, the free walking tour guide in San Cristobal de las Casas talks about San Juan de Chamula. Indeed, what an interesting place. San Juan Chamula, a small village just outside of San Cr...