I travelled to Stockholm this week to deliver a presentation about our Git workflow on Sonic Dash. Originally I was asked to do a talk about the process of converting Sonic Dash to intel based chip sets, but since that would take all of 3 minutes, I worked it into a talk about how we… Continue reading Git Workflow Presentation – Intel Buzz Workshop
Category: Git
Accu 2014 Conference Notes
I had the chance to go to ACCU 2014 the other week (full conference schedule is here) and I have to say it was one of the best conferences I've had the pleasure to attend. And while it did confirm my idea that C++ is getting the point of saturation and ridiculous excess (C++11 was… Continue reading Accu 2014 Conference Notes
Git Off My Lawn – Large and Unmergable Assets
I posted up the Git talk myself and Andrew Fray did at Develop 2013 and mentioned I'd have a few follow up posts going into more detail where I thought it was probably needed (since you often can't get much from a slide deck and no-one recorded the talk). One of the most asked questions… Continue reading Git Off My Lawn – Large and Unmergable Assets
Git Off My Lawn – Develop 2013
Recently myself and Andrew Fray (@tenpn) presented "Git Off My Lawn" at Develop 2013 in Brighton. The talk was designed to discuss how we took a Perforce centric development process and moved over to one centred around Git and a Git based branching work flow. As with most presentations the slides tell half (or less)… Continue reading Git Off My Lawn – Develop 2013
Git Fetch –prune and Branch Name Case
I posted up the following to the git community mailing list the other day When using git fetch --prune, git will remove any branches from remotes/origin/ that have inconsistent case in folder names. This issue has been verified in versions 1.7.10.2, 1.7.11.1 and 1.8.3.2. I've described the reproduction steps here as I carried them out,… Continue reading Git Fetch –prune and Branch Name Case
Setting up Git on ReviewBoard
I've recently made the switch to Git and started using it on a couple of project at work. One of the important things I needed was to get automatic generation of reviews working on ReviewBoard for our Git server and I was in luck because it's pretty simply to do. I'm posting this here both… Continue reading Setting up Git on ReviewBoard
