When you work on a codebase with other people, you need to manage your local branches: you need to ensure that when you push some code and create a merge/pull request on the remote branch, your changes will be easily integrated with the main codebase. And by "easily" I mean preferably without merge conflicts or … Continue reading Managing local git branches with git rebase
Category: how-to
A caller id for your python function
Most of you might be too young to know this but there was time that the phone in your house - not in your pocket! - would ring and gasp! you had no idea who was calling! You had to ANSWER the phone to find out. 🤦♀️ Now we have caller ID and know exactly … Continue reading A caller id for your python function
git stash 101
git stash allows you to save your work in progress out of your way
Developing inside a Docker container
A few months ago I got a new computer and I have been very intentional about deciding what I install on it. From past experience I know that computers that are used as a development environment tend to get messy in no time since one might install all kinds of libraries, frameworks, dependencies, you name … Continue reading Developing inside a Docker container
How to permit nested parameters in Rails
The context Rails 5 introduced a big change in how it handles ActionController::Parameters (the parameters that you get on your Controllers): before Rails 5, if you called your params you would get a hash back and after Rails 5, you get a ActionController::Parameters object. You can see that by calling params.inspect and if you call … Continue reading How to permit nested parameters in Rails
Git, GitHub and GitLab. Are they all the same thing?
A few years back when I got serious about learning to program to become a software developer, I remember hearing about version control and getting really confused about git and GitHub (one can add GitLab to this list also!). Are they the same thing? Eventually I figured it out but this past week in a … Continue reading Git, GitHub and GitLab. Are they all the same thing?
Find the commit that introduced a bug in your code: how to use git bisect in 7 steps
When I first heard about git bisect I thought it sounded scary and complicated, so I never looked for an opportunity to learn more about it and use it. That's until last week when I ran into a bug in our master branch. I knew that the bug was not there two days before so … Continue reading Find the commit that introduced a bug in your code: how to use git bisect in 7 steps
How to upgrade Rails
I don't write much about Rails here but whoa, two posts in a row! Well, it turns out that I thought I should record another lesson I learned while upgrading Rails: how to do it, meaning, what are the practical steps one should take to upgrade Rails? During my research at work I came across … Continue reading How to upgrade Rails