Version Control with Subversion
This review was originally printed in the December 2008 edition of the UKUUG newsletter, which is now defunct. Title: Version Control with Subversion (2nd edition)Authors: C. Michael Pilato, Ben Collins-Sussman,…
Moving unstaged changes to another branch in Git
If you move around between different branches a lot in Git, you might find that you accidentally make some changes on the wrong branch and only realise this when it…
Git commits made directly to branch
Sometimes in Git I'll need to synchronise a long-lived feature branch with master to reduce the likelihood of merge conflicts at a later date. One of the problems with doing…
Copying a file from another branch in Git
Copying a file from another branch into my current branch is something I do every so often in Git, e.g. when I want to reset a file in staging to…
Self-hosted Git using SSH
Most of my Git needs are met by GitHub (public) and BitBucket (private), but occasionally I want to hold confidential data on a server which I control. There are self-hosted…
Training courses under development
About a month ago, I posted about the possibility of charging for training notes. Based on the feedback I received via Twitter, I've decided to make all future training notes…
Charging for training notes?
Earlier this year I delivered a half-day workshop entitled Configuration Management with Ansible and Git. I spent a lot of time preparing the notes for the workshop, and as a result…
Configuration management with Ansible and Git slides
Earlier this week I delivered a talk entitled Configuration Management with Ansible and Git at the FLOSS UK Spring conference. I've now uploaded the slides for my talk, which you can view…
Adding a progress bar to Mercurial
Most open source projects seem to use Git, but there are a few which have opted for Mercurial instead, most notably Mozilla projects such as Firefox and Thunderbird. For some inexplicable reason,…
Deleting branches in Git
For some projects, the workflow I use in Git is to create a new branch for every new feature or bug fix. This works well for keeping things separate, but…