From time to time it is nessary to update the Chirpy theme I use here on my site. I end up failing to recall my steps everytime so I figured I better write them out and maybe someone might find it interesting.
So I use the ‘production’ branch as what I base my site off of. So step one is to sync the production branch to my repos. I simply go to the branch and hit sync fork. I also do this for the master branch as well, for no reason. I dont make any changes to production or master branches, they are just replicas for my purpose.
I have a branch called mtcom-development where I do all my changes and inital blog posts editing. To sync this branch with the themes production branch I have to run the following.
Yay for conflicts of my changes.
It could be worse, I only have to look at 4 files this time. I ignore the ones in
_drafts. To modify those 4 files I tend to use VSCode with a git plugin to handle the compare.
Though sometimes I forget that
git status puts in things to identify changes. I just need to go back in and remove those ensuring the upstream and my changes are what I want.
After that usually in VSCode I do the equivalent of
git push to push the changes up into the repository. After that is done it takes just a moment for CloudFlare Pages to kick and pull the repo, build the site, and give me a semi temporary url to go view the results in.
After a quick review of does everything look good still? If it does I just switch the
mtcom-production branch and pull changes from
mtcom-development. It should have no conflicts and serves as the new production that github will pickup, compile, and publish for me.