Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git and GitHub Workflows

Matthew McCullough
August 26, 2013
Programming
2
590

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.

Matthew McCullough

August 26, 2013
Tweet

More Decks by Matthew McCullough

See All by Matthew McCullough
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
matthewmccullough
1
350
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
130
Git and GitHub Platform Review
matthewmccullough
1
290
Your First Pull Request
matthewmccullough
0
240
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
680
Agile-ish life at GitHub
matthewmccullough
2
280
Git and GitHub Agile Workflows for HP
matthewmccullough
0
240
Writing Tools on the GitHub Platform
matthewmccullough
0
220
Git Feature Branches as an Art
matthewmccullough
0
140

Other Decks in Programming

See All in Programming
pnpm workspace実践ノウハウ
mh4gf
8
950
Chatwork プロダクト本部 紹介資料（エンジニア向け）
chatwork_hr
0
470
Astro 3.0入門
nozaki
0
190
Flutterにおけるアプリ内課金実装 -Android/iOS完全なる統一 -
nacatl
1
620
新卒研修でNext.js AppRouterを導入した 学びと反省
iuchimasatoshi
1
190
ブラウザで「今すぐ」gemを読み込む方法 / Load-gem-from-browser-JUST-NOW
lnit
0
280
Gradle Convention Plugins
jmatsu
1
470
Maintaining E2E Test Automation as We Transition from View to Compose
tkhs0604
0
460
Do Repeat Yourself: How to move from Development into Leadership
lukestringer90
1
140
アジャイルのライトウィングとレフトウィングはひとりで両方できなくてもいいんじゃない？ - “ひとりでできるもん”から“みんなでできるもん”への道のり
psj59129
0
180
Build Backwards-Compatible REST APIs with Rolling Versions
subomi
0
130
締切とはなにか、どういう効果があるのか #scrummikawa
murabayashi
0
260

Featured

See All Featured
Git: the NoSQL Database
bkeepers
PRO
420
61k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
33
8.5k
How to Ace a Technical Interview
jacobian
272
22k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
271
12k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
15
1.6k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
352
21k
The Web Native Designer (August 2011)
paulrobertlloyd
78
2.6k
jQuery: Nuts, Bolts and Bling
dougneiner
57
6.8k
A Philosophy of Restraint
colly
195
15k
The Illustrated Children's Guide to Kubernetes
chrisshort
26
45k
Fashionably flexible responsive web design (full day workshop)
malarkey
395
64k
The Cult of Friendly URLs
andyhume
71
5.3k

Transcript

  1. Git and
    GitHub Workflows

    with Mahew McCullough

    View Slide

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

    View Slide

  3. Git
    1

    View Slide

  4. View Slide

  5. GitHub
    2

    View Slide

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

    Repositories
    8.0 million

    Users
    4.8 million

    Hubbernauts
    200

    Founded
    2008

    View Slide

  7. Paerns
    3

    View Slide


  8. Developer

    View Slide


  9. Maintainer

    View Slide


  10. Long-term support

    View Slide

  11. Branches
    4

    View Slide


  12. Primary-only

    View Slide


  13. master and feature

    View Slide


  14. master and
    feature and
    bug fix

    View Slide


  15. master and
    feature and
    bugfix

    View Slide


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

    View Slide


  17. git-flow

    View Slide

  18. View Slide


  19. GitHub Flow

    View Slide

  20. View Slide

  21. View Slide

  22. View Slide

  23. Merges
    5

    View Slide


  24. single feature delivery

    View Slide


  25. big-bang integration

    View Slide

  26. History
    6

    View Slide


  27. quality of code

    View Slide


  28. quality of history

    View Slide


  29. when history becomes permanent

    View Slide


  30. git commit --amend

    View Slide


  31. git rebase

    View Slide


  32. git rebase -i

    View Slide

  33. CI
    7

    View Slide


  34. status where it makes sense

    View Slide

  35. View Slide

  36. Git and
    GitHub Workflows

    with Mahew McCullough

    View Slide


  37. training.github.com

    View Slide

  38. @mahewmccull
    @githubtraining
    [email protected]

    View Slide