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. […]
You can run rubocop on just a local branches’ changes like this: git fetch && git diff-tree -r –no-commit-id –name-only master@\{u\} head | xargs ls -1 2>/dev/null | xargs rubocop –force-exclusion Then you can create 2 corresponding aliases in your terminal .rc file to make this easy to remember: # Alias to run rubocop on the current branch’s diff from […]
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. […]
Since rails-api was merged into Rails as part of Rails 5, the rails-api project has largely been abandoned, and for good reason. People who have a rails-api app will want to update to Rails 5 in order to stay up-to-date. Although the process is not hard, it is slightly different from a traditional update from Rails 4 to Rails 5. […]
Strategy #1: Take whatever you can find This is far too common. By definition, whatever you can find typically means a job that you can be quickly trained to do. This generally ends up being at a nonskilled job at a restaurant or a retail store or something like that. Any job that you can be quickly trained to do […]
So Scrum. The most popular agile software development methodology, with seemingly around 70% of agile teams using it. What is it all about? Is it good or is it whack? Has Scrum made our lives better? Let’s dive in. Scrum assumes you can reliably estimate task duration Scrum has good intentions. Measuring your productivity. Accountability to not do more or […]
Things individuals can do to protect Flow: Keep your phone on silent all day long. Disable all notifications on your computer. Distractions from a phone / computer can disrupt Flow dozens of times every day. Respond to text messages, phone calls, and e-mails when you get stuck. Distractions actually help you when you get stuck. Find music that helps you […]
One of the things that I’ve found is that my Angular services tend to have a lot of duplicate logic in them. The biggest culprit is HTTP calls for CRUD operations. Whether I’m using Restangular, ngResource, or plain ole’ $http, this has been a constant source of un-DRYing in my code. Let’s take a look at using ECMAScript 6’s class […]