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
git stash allows you to save your work in progress out of your way
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?
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
I recently committed an API key to a repository and even worse, I pushed to GitHub before I realized my mistake... 😦 Removing the key from the code base wouldn't completely solve my problem since a commit diff would still display my secret key. The solution was to remove that commit from history. Removing commit … Continue reading Remove a commit from history in Git – local and remote
Here's a list of the git commands I use most often: git status when to use it: to know what is the status of the files in your branch. It will show what files have been modified, added, removed, committed, etc. A snapshot of your branch's current situation. It's super safe because it doesn't change anything. … Continue reading Git: most used git commands