Wanted to post my current workflow for resolving merge conflicts in Rails Encrypted Credentials. Because these files are encrypted, git has trouble working out merge conflicts in them. Maybe this will be useful to someone or maybe someone else has an even better way of doing this you can tell me about. Make edits to proposed_master_credentials.yml, addressing the diffs until […]

Today I learned that if you have a big Pull Request on GitHub / GitLab, and you want to split it up into smaller PR’s, git’s rebase will automatically remove those commits from your big Pull Request if you open new smaller Pull Requests for them via cherry-pick:

Got a call from my bank this morning. For the sake of example, I’ll say it was Wells Fargo Bank (it isn’t actually, I’ll keep the bank name private). It came from their main number that I have saved in my contacts so my custom name for that bank contact and the official phone number appeared on the caller id. […]

Lately I have been looking for ways to make my smartphone less addictive. With the rise in popularity of e-ink displays like a kindle, I wondered if I could get a lot of the benefits of that minimalistic approach but with all the power of my smartphone. So I set out to convert my phones to running in grayscale mode. […]