Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.
Intermediate Git:
Workflows for Teams
Matt Wrather, Wrather Creative
DrupalCamp LA 2015
Drupal Developer,
Bon Vivant,
Man of Mystery
matt@wrathercreative.com
@mwrather
(doesn’t use git)
photo: slworking
CC-BY-NC-SA
Photo: mikebabcock
CC-BY
We need…
• Flexibility
• Collaboration
• Recoverability
• Awesomesauce
• Impatient
• Disorganized
• Indecisive
• Insecure
...
Agenda
“In theory there’s no difference

between theory and practice.
In practice, there is.”
—Yogi Berra
Problems with
Git Flow
It’s a little intense.
“There are two kinds of people in
this world—those who believe
there are two kinds of people in
this world and those who a...
Winchester Mystery House
San Jose, CA
Fetch and Rebase Workflow
$ git checkout -b my-feature-branch master
# work, stage, commit, repeat; then:
$ git fetch

$ gi...
Fetch and Rebase Workflow
$ git checkout my-feature-branch

$ git merge master

# work, stage, commit, repeat; then:
$ git ...
Thou Shalt Not Rebase Commits
Thou Hast Pushed To a Remote Repository.
Topic Branch Workflow
$ git checkout master

$ git pull
$ git checkout -b topic-branch-1 master

$ git checkout -b topic-br...
feature/
bugfix/
release/
google-sitemapab-123-google-sitemap
http://thedoghousediaries.com/5468
DATA YOU LEFT OUT A SEMICOLON
ENGAGE FACEPALM
checkout
revert
reset
reset --hard
rebase -i
Thou Shalt Not Rebase Commits
Thou Hast Pushed To a Remote Repository.
reflog
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015
Upcoming SlideShare
Loading in …5
×

Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015

512 views

Published on

Matthew Wrather presents Git Workflows for teams at DrupaCamp LA 2015, presented by Los Angeles Drupal

Published in: Technology
  • Be the first to comment

  • Be the first to like this

Intermediate Git: Workflows for Teams at DrupalCamp LA, 2015

  1. 1. Intermediate Git: Workflows for Teams Matt Wrather, Wrather Creative DrupalCamp LA 2015
  2. 2. Drupal Developer, Bon Vivant, Man of Mystery matt@wrathercreative.com @mwrather
  3. 3. (doesn’t use git) photo: slworking CC-BY-NC-SA
  4. 4. Photo: mikebabcock CC-BY
  5. 5. We need… • Flexibility • Collaboration • Recoverability • Awesomesauce • Impatient • Disorganized • Indecisive • Insecure We are…
  6. 6. Agenda “In theory there’s no difference
 between theory and practice. In practice, there is.” —Yogi Berra
  7. 7. Problems with Git Flow It’s a little intense.
  8. 8. “There are two kinds of people in this world—those who believe there are two kinds of people in this world and those who are smart enough to know better.” —Tom Robbins Still Life with Woodpecker (2001)
  9. 9. Winchester Mystery House San Jose, CA
  10. 10. Fetch and Rebase Workflow $ git checkout -b my-feature-branch master # work, stage, commit, repeat; then: $ git fetch
 $ git rebase origin/master $ git checkout master
 $ git merge origin/master $ git merge --no-ff my-feature-branch
 $ git push origin master
  11. 11. Fetch and Rebase Workflow $ git checkout my-feature-branch
 $ git merge master
 # work, stage, commit, repeat; then: $ git fetch
 $ git rebase origin/master $ git checkout master
 $ git merge origin/master $ git merge --no-ff my-feature-branch
 $ git push origin master
  12. 12. Thou Shalt Not Rebase Commits Thou Hast Pushed To a Remote Repository.
  13. 13. Topic Branch Workflow $ git checkout master
 $ git pull $ git checkout -b topic-branch-1 master
 $ git checkout -b topic-branch-2 master
 $ git checkout -b topic-branch-3 master
 $ git checkout -b topic-branch-4 master # work and push $ git checkout -b staging master
 $ git merge topic-branch-1 topic-branch-2 # etc. $ git checkout master
 $ git merge staging
  14. 14. feature/ bugfix/ release/ google-sitemapab-123-google-sitemap
  15. 15. http://thedoghousediaries.com/5468
  16. 16. DATA YOU LEFT OUT A SEMICOLON ENGAGE FACEPALM
  17. 17. checkout
  18. 18. revert
  19. 19. reset
  20. 20. reset --hard
  21. 21. rebase -i
  22. 22. Thou Shalt Not Rebase Commits Thou Hast Pushed To a Remote Repository.
  23. 23. reflog

×