Git and GitHub Workflows

Git and GitHub Workflows

"All About Git Workflows"

When working with Git and GitHub, a common question is “What is a good workflow?” Join us for an exploration of pros and cons with git-flow and the GitHub Flow, branching patterns and merging strategies, as well as the nuances of rebasing and version history. See real-world scenarios and live demos to help make informed decisions that might work well for your team.

Bededa744012c87721d68f69342f81b0?s=128

Matthew McCullough

August 26, 2013
Tweet

Transcript

  1. Git and GitHub Workflows  with Mahew McCullough

  2. Mahew McCullough @mahewmccull @githubtraining

  3. Git 1

  4. None
  5. GitHub 2

  6. WORLD’S LARGEST CODE-SHARING PLATFORM VC Investment $100 million Repositories 8.0

    million  Users 4.8 million  Hubbernauts 200  Founded 2008 
  7. Paerns 3

  8.  Developer

  9.  Maintainer

  10.  Long-term support

  11. Branches 4

  12.  Primary-only

  13.  master and feature

  14.  master and feature and bug fix

  15.  master and feature and bugfix

  16.  master and stable and qa and integration and feature

    and bugfix
  17.  git-flow

  18. None
  19.  GitHub Flow

  20. None
  21. None
  22. None
  23. Merges 5

  24.  single feature delivery

  25.  big-bang integration

  26. History 6

  27.  quality of code

  28.  quality of history

  29.  when history becomes permanent

  30.  git commit --amend

  31.  git rebase

  32.  git rebase -i

  33. CI 7

  34.  status where it makes sense

  35. None
  36. Git and GitHub Workflows  with Mahew McCullough

  37.  training.github.com

  38. @mahewmccull @githubtraining training@github.com