Working out our git strategy