Version Control Articles

git error: path is unmerged

While attempting to update my dotfiles locally on my MacBook Pro, I ran into a bit of a dilemma with one of my files that I had edited but never committed. Not a big deal, I can just run git stash and apply the changes again later. No such luck […]

Showing differences of staged files with git

Something I don’t like about git, primarily because it doesn’t fit into my personal development workflow, is how git diff only applies to files that have not been staged to commit. Sure, it makes sense if you are the type to stage files locally on a regular basis without pushing […]

Response Time Comparison: GitLab Pages vs. Cloudflare Pages

While I compare VPS hosting providers every month, I actually don’t my personal blog (this site) on a VPS anymore. Come to think of it, I don’t even remember if this particular iteration of my own private slice of the Internet has ever been on a VPS instance. I’ve definitely […]

How to push an empty git commit

We’ve all been there. We need to trigger something from a commit to a git repository, and instead of triggering the build directly, we end up tweaking something in a file, committing it, and pushing it. It’s usually just adding a blank line (and subsequently removing it, depending on where […]

How to push to multiple git repos at once

A while back I fell in love with GitLab, specifically their GitLab Runners. This was at a time before GitHub had GitHub Actions, so I decided to move the majority of my git repositories over to GitLab. Fast forward a few years, GitHub has Actions, and more importantly, it seems […]

How to get the default git branch

As the world has been shifting away from using terms like master and slave in technology, I was left wondering what the heck I was going to do about my git aliases that relied explicitly on the word master. git itself makes it really easy to swap the default branch […]

Only run step for specific version with GitHub Actions

With my recent exploration of GitHub Actions, I’ve had to figure out things that I’ve already figured out with other systems like GitLab Runners and Travis CI. One such thing is conditionally running steps. For things like code coverage, I’m only interested in sending off the coverage report to the […]

Speed Comparison: GitHub vs. GitLab (2020)

Been a minute since I’ve done one of these comparisons. The first one took place in 2016 with annual follow ups in 2017 and 2018. Then there was the curious case of 2019 where I had this post in my queue but never actually ran the benchmarks. I think the […]

Complete CI/CD pipeline with GitLab Runners

Automation is one of the best ways to improve productivity. Even as a development team of one, spending a bit of time on DevOps and improving your developer quality of life can pay off immensely. Automated tasks strip away cognitive load. No more forgetting to deploy code because the process […]

Speed Comparison: GitHub vs. GitLab (2018)

It’s been over a year since I had last compared the speed of GitHub versus that of GitLab. In that time Github was sold to Microsoft and I’ve been adopting GitLab for all of my projects (completely unrelated to the sale, I promise ;) The reason for moving from GitHub […]

Minimalist git prompt

For as long as I can remember, I have had some sort of git status as part of my shell prompt. Early on I had used the canned git prompt scripts that are floating around out there. I felt they were way too bloated with the 42-some-odd glyphs that they […]

Trigger a GitHub Pages rebuild with AWS Lambda and CloudWatch

GitHub Pages is pretty damn great. I’ve been using it for years now but one thing has always bugged me. If you want to schedule your posts in advance, they just never show up. Why? Because for posts to show up you have to trigger a rebuild of the project […]

Speed Comparison: GitHub vs. GitLab (2017)

It’s been just a bit over a year since I did my original speed comparison of GitHub and GitLab. There’s been a lot of moving and shaking from both companies over that period. Some of it has been good, like GitHub changing their pricing and private repo offering. Then there’s […]

Sourcing external files from your .gitconfig

If you’re like me, there’s a great chance that you have not only some public dotfiles but you also have some private stuff you don’t want the world to have open access to. I refer to these private dotfiles simple as dotprivate. I include my dotprivate files as a submodule […]

How to pull from git

Had a peculiar request on one of my posts asking for a tutorial on how to pull from git. To be honest, I’m not entirely sure if the comment was just trolling or what, but figured may as well do a post on it. Cloning a repository If you want […]

Speed Comparison: GitHub vs. GitLab

There’s been quite a bit of movement in the code repository hosting space recently. Open letters have been written. Companies are attempting to capitalize on their competitor’s shortcomings. Those competitors have been improving their offerings. It’s a great time to be alive! That being said, this isn’t a post comparing […]

Migrating from WP Engine to GitHub Pages

After giving it nearly a full calendar year, I have decided to migrate my PHP blog (PHP Avenue) off of WordPress via WP Engine and on to GitHub Pages. The decision ultimately boiled down to WordPress having way more available functionality than I was actually using and me not seeing […]

Dynamic page titles with GitHub Pages

Ran into a bit of an issue today when deploying some changes to my blog. The home page, which was working just fine locally, was being treated as if it were a blog post page. What keyed me off to this was the title of the page which was “joshtronic […]

Version Control for Individuals

I find with a lot of folks I interact with, version control is considered something that you use when you are working on a team with multiple contributors. As an individual that is usually the sole contributor of my own projects, I have to disagree as version control is still […]

Moving from Tumblr to Jekyll (and GitHub!)

As you may remember, I moved my blog (and my wife’s blog and every other site blog I have) to Tumblr. At the time, it made perfect sense. Tumblr’s platform is quite robust and they have a dedicated staff that is enhancing the system (something my own blogging platform did […]

Mass svn add script

So I have a tendency to add a bunch of new files to a project before actually doing a commit in Subversion. It’s usually not an issue, I go through an add each new file and then finally do my commit. Welp, I’m sick of it, so I wrote a […]