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

Git and GitHub for Better Collaboration

Matthew McCullough
September 11, 2012
Programming
5
400

Git and GitHub for Better Collaboration

Delivered at First Round Capital in San Francisco. Resources at: https://github.com/github/teach.github.com

Matthew McCullough

September 11, 2012
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
360
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
140
Git and GitHub Platform Review
matthewmccullough
1
320
Your First Pull Request
matthewmccullough
0
260
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
720
Agile-ish life at GitHub
matthewmccullough
2
310
Git and GitHub Agile Workflows for HP
matthewmccullough
0
250
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
データアナリストが行うDatabricksを活用したETLの自動化事例
shinoa
0
270
検証も兼ねて個人開発でHonoとかと向き合った話
hanetsuki
0
890
PHPはいつから死んでいるかの調査
chiroruxx
1
400
Goのmultiple errorsについて (2024年4月版)
syumai
3
690
デフォルトにして至高、RubyMineの大好きな所
ruzia
0
330
エンターテイメント業界で利用されるAWS
demuyan
0
210
코틀린으로 멀티플랫폼 만들기
pangmoo
0
150
Rethinking UI building strategies @ SFI 2024
letelete
0
270
『Railsオワコン』と言われる時代に、なぜブルーモ証券はRailsを選ぶのか
free_world21
0
110
VS Code をプロダクトにどう取り込むか
onomax
1
360
Snowflakeで眠ったデータを起こそう！
estie
0
120
StoreKit2によるiOSのアプリ内課金のリニューアル
kangnux
0
110

Featured

See All Featured
Testing 201, or: Great Expectations
jmmastey
28
6.3k
Building a Scalable Design System with Sketch
lauravandoore
456
32k
Happy Clients
brianwarren
92
6.4k
Stop Working from a Prison Cell
hatefulcrawdad
266
19k
The Cult of Friendly URLs
andyhume
74
5.7k
Writing Fast Ruby
sferik
621
60k
Optimising Largest Contentful Paint
csswizardry
8
2.4k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
274
13k
Navigating Team Friction
lara
178
13k
Building a Modern Day 
E-commerce SEO Strategy
aleyda
17
6.4k
Web Components: a chance to create the future
zenorocha
305
41k
KATA
mclloyd
15
12k

Transcript

  1. GIT AND GITHUB for better collaboration for better collaboration

  2. &

  3. [email protected] github.com/training @matthewmccull matthewmccullough

  4. Who is Matthew? Open source contributor Build tool and continuous

    delivery author 5 year Git evangelist VP of Training at GitHub

  5. What are we talking about? Why isn't it just SVN++?

    Rebasing demo Rename and merge demo How does Git facilitate collaboration? Pull Request demo How does Git + GitHub collate team contributions? SVN conversion tools

  6. ITz Cray

  7. None
  8. None
  9. None
  10. None
  11. None
  12. None
  13. None

  14. SVN++ ?

  15. None
  16. None

  17. ‣Local branches ‣Social coding ‣Fork and pull model ‣Web-based image

    diff ‣Lightweight issue tracking

  18. Blessed Repo

  19. refs

  20. centralized VCSs use sequential revision numbers

  21. Git uses a SHA-1 hash

  22. None

  23. 40 hex characters (20 bytes)

  24. 9AB223D28B1AA46EF1780B22F304982E39872C34

  25. 9AB223D28B1AA46EF1780B22F304982E39872C34 <html> <body> <p>This is a test</p> <img src="http://ai.com/icon.gif"> </body>

    </html> 9AB223D28B1AA46EF1780B22F304982E39872C34

  26. ‣Blob ‣Tree ‣Commit ‣Tag

  27. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  28. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  29. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  30. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  31. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  32. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  33. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  34. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  35. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  36. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  37. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  38. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  39. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  40. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  41. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  42. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  43. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird

    committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

  44. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  45. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  46. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  47. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  48. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  49. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1
  50. None

  51. Simpler merges

  52. — No engineer, ever Wow! Version control!

  53. DAG

  54. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B Δ Δ Δ Δ Δ Δ Δ

  55. Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin

    Checkin Delta storage gets slower as the history of a file gets longer
  56. None

  57. Copy of the entire tree per commit

  58. Why?

  59. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  60. hard link to existing identical blobs

  61. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C ß

  62. zlib deflates each blob at commit

  63. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  64. zlib deflates the entire repo

  65. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  66. Act I 2100 MB became 205 MB

  67. None

  68. Rebasing

  69. a32 2e2 8b3 Master/Trunk/MainLatest e69 d19 Branch

  70. a32 2e2 8b3 e69 d19 Branch Master/Trunk/MainLatest Rebase

  71. a32 2e2 e69' d19' 8b3 Branch Master/Trunk/MainLatest Rebase

  72. a32 2e2 e69' d19' 8b3 Branch Master/Trunk/MainLatest Merge

  73. None

  74. PRDD (Pull Request Driven Development)

  75. Agile ‛ GIT

  76. Idea ‛ Markdown

  77. Review ‛ Pull Request

  78. None
  79. None
  80. None

  81. Visualizations

  82. None

  83. Subversion

  84. SVN ‛ GIT

  85. None
  86. None
  87. None
  88. None

  89. — Every manager, ever If it isn't broke, don't fix

    it.

  90. Migration Tools

  91. git-svn

  92. git-svn Core Git feature

  93. $ git svn clone -s http://yourhost.com/reporoot/

  94. git-svn Consumes an authors email mapping file

  95. (no author) = Codehaus infra <[email protected]> sdevijver = Steven Devijver

    <[email protected]> markcc = Mark CC <[email protected]> joe = Joe <[email protected]> ajtarter = Aaron J Tarter <[email protected]> liddon = Lidia Donajczyk-Lipinska <[email protected]> jshickey = Scott Hickey <[email protected]> HamletDRC = Hamlet D'Arcy <[email protected]> aalmiray = Andres Almiray <[email protected]> blackdrag = Jochen Theodorou <[email protected]> bob = Boc McWhirter <[email protected]> brownj = Jeff Brown <[email protected]> cstein = Christian Stein <[email protected]>

  96. git-svn Migrates Subversion tags to Git branches

  97. None

  98. svn2git

  99. None

  100. $ svn2git http://matthew.com/svnrepos/project1

  101. importing to git

  102. None

  103. # Publish one branch $ svn2git http://matthew.com/svnrepos/project1 $ git remote

    add origin https://github.com/you/project1 $ git push origin master

  104. # Publish all branches and tags $ svn2git http://matthew.com/svnrepos/svnproject1 $

    git clone file://yourpath/svnproject1 gitproject1 $ cd gitproject1 $ git remote add origin https://github.com/you/project1 $ git push --mirror origin

  105. Serving SVN from Git

  106. None

  107. $ svn co https://github.com/you/project1/trunk p1svn

  108. Continuous delivery

  109. pull requests

  110. peer review

  111. None
  112. None
  113. None
  114. None

  115. graph everything

  116. None
  117. None
  118. None

  119. optimize for happiness

  120. Thanks!

  121. [email protected] github.com/training @matthewmccull matthewmccullough