This is a presentation give to the Vancouver Drupal users group about moving to GIT as a version control system for a small development team. The presentation details the workflow we settled on, and the git flow method for branch management. You can see a video of the presentation here - http://www.ustream.tv/recorded/13544036
1. Git workflows for Drupal projects Mack Hardy, Raphael Huefner, Smith Milner, Shawn Price @AffinityBridge
2. What is a workflow? "... a sequence of connected steps " -Wikipedia The workflow we are looking for is an efficient method to allow multiple developers to integrate working code into a project.
3.
4.
5.
6. Submodules Everywhere $ git submodule add http://git.drupal.org/project/views.git sites/all/modules/contrib/views Don't forget to push all commits to your submodules!
11. gitflow: prepare repository $ git flow init rough equivalent: $ git init # if necessary $ # do some configuration (save prefix choices) $ # if there's no "develop" branch yet, create one: $ git checkout -b develop master This brings you away from the master branch. You should never commit to it directly anymore.