Rebasing one branch onto another
Ok, I’m tired of looking this up, so I’m going to document it here for future me. We have a branching strategy: maint-2014.04.04 maint-2014.04.18 … master When I create a new branch based off master, I name it 1234567890_some_short_summary_master. Later I determine it should have been based off maint-2014.04.04. Here’s the process: [code] git checkout […]
Cruise control.rb refusing to build a project
I ran into an interesting problem at work today. I had a cruise control project that would not build the project after a commit was made. Other projects in CruiseControl.rb were working properly. Here’s the steps I used to debug: Login to your Cruise Control box and cd to $BUILD_DIR/projects/$PROJ_NAME/work Run the following command. This […]
GitHub set author/committer
I’ve been working with Git lately and more specifically GitHub. I noticed something odd one day. Where most commits have one author listed, these commits had both a author and a committer listed. More specifically, the author field was the two members of the pair and the committer name was the workstation they were working […]