We can’t do a fast-forward merge when the most recent commit on the receiving branch does not appear in the branch we are merging in. One of our options in this situation is to rebase the branch we want to merge in.
When visualizing Git branches, I find it easier to think of them as stacks of building blocks rather than the traditional Directed Acyclic Graph (DAG) visualizations.
Recently on a project I wanted to migrate WordPress users with a certain role to a different role. This is the command I used.
When you are using Git commit validation (a.k.a. commit linting) and it fails, it is frustrating to re-type your message. Git stores the commit message that failed validation. You can use this stored message to start your new commit message.
When working with Git and you run “git pull” sometimes you get the error message, “There is no tracking information for the current branch.” You can fix this by running a command to set your local branch to track the origin branch of the same name.
One of the things that made me much better at Git was making my current branch (and whether or not I have any changed files) always visible. By default zsh includes everything you need to do this, you just need to configure it.
By default “git branch” will list all of your local branches with an asterisk in front of the current branch. We can remove the asterisk and list only the branch names by adding the “format” parameter.
I recently setup a new MacBook as my primary machine and I made these notes in the hope they will streamline the process for me in the future.
As part of my work I spend a lot of time in Jira. Now that I’m using Alfred as part of my daily routine, I’ve created an Alfred workflow to help me.
Every developer I know struggles with impostor syndrome. The problem with this fact is, if people I admire for their many skills have impostor syndrome then clearly I am an impostor since I’m not as good as they are.