Save 37% off PRO during our Black Friday Sale! »

The Foundations of Collaboration with GitHub • SIGCSE 2014

Bededa744012c87721d68f69342f81b0?s=47 Matthew McCullough
March 08, 2014
Programming
1
88

The Foundations of Collaboration with GitHub • SIGCSE 2014

Bededa744012c87721d68f69342f81b0?s=128

Matthew McCullough

March 08, 2014
Tweet

More Decks by Matthew McCullough

See All by Matthew McCullough
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
330
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
130
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
260
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
200
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
570
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
250
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
220
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
130

Other Decks in Programming

See All in Programming
B04bd8797ce182483a5ded98f7cada6f?s=48 berlysia
14
5.2k
4d78b749c315e21a956053dcbf0508a9?s=48 po3rin
1
200
434123e6e96afad5905d876ff5e355ca?s=48 castaneai
2
1.3k
8f84b7d8869ef6005d89b378e8661f7c?s=48 masuda220
PRO
9
4.6k
023b04c98f39cc041293d780352432ff?s=48 koic
11
1k
B83842a07c4241e2aec3e2dfeedf16fe?s=48 mu_mu_mu
0
330
A10e41b0a61d59f2258d7f6172c33479?s=48 kaityo256
2
110
Fe9968bc3922faa77939286afda905de?s=48 chloe463
0
1.6k
A2443b68836f2d166eae52b940e99bf6?s=48 galkin
0
110
E0e036f89c14b3e59640318eedf9670b?s=48 bkuhlmann
4
390
A12373843afc54857a845404bdd5f5cb?s=48 lighttiger2505
1
270
19d7ae634445d4bd9b10c7961a462260?s=48 shu223
1
390

Featured

See All Featured
5f50f94346fbcb23706f0707169317a4?s=48 aarron
261
37k
C44e1f7e22c3f23cff7bc130871047ef?s=48 eileencodes
118
27k
9375a9529679f1b42b567a640d775e7d?s=48 schacon
152
6.9k
F68cb25ae3e5c2106997454b13b7737d?s=48 brad_frost
163
6.9k
7c8469ee8c9e594c65c59b919626c08d?s=48 scottboms
253
11k
B3d6434763caa0ef5dc4b792662c49f7?s=48 smashingmag
289
47k
7653c7c449918ff6542880a8c284f5e7?s=48 jponch
106
5.4k
6bb82b13cda86d3b821fa44100335ddf?s=48 thoeni
6
980
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
196
17k
170b760e0147792d0140e59ec78e9893?s=48 eitanlees
120
11k
79acae287842acf29084005533a7fb3b?s=48 hursman
112
9.6k
D09fad3e36ae6841f54820be0e907f7a?s=48 rocio
156
12k

Transcript

  1. A foundation of collaboration presented to the delegates of SIGCSE

    2014 Version control with

  2. Matthew.... @matthewmccull ‣Open source contributor ‣O'Reilly Git Video Co-instructor ‣Co-Author

    of O'Reilly's Git book ‣5-year Git trainer ‣Instructor at GitHub

  3. http://oreil.ly/ogitvid

  4. http://amzn.to/oreillygit

  5. Version Control A refreshed approach to VCS

  6. None

  7. Open Source

  8. bash scripts ☛ C code

  9. is not a slightly better

  10. None
  11. None
  12. None

  13. http://git-scm.com

  14. Starting Up Creating a repository

  15. Get a GitHub account.

  16. Get a GitHub account. http://github.com/join

  17. Create a new repo(sitory).

  18. Add a file.

  19. View the commit history (timeline).

  20. Make changes to the file.

  21. Repo Creation Local and remote initialization simplicity

  22. # Green field project! $ git init newproject! $ cd

    newproject! # ...start coding

  23. or if you already have source code

  24. # Legacy project tree! $ cd existingproject! $ git init!

    ! # Add all the code! $ git add .! $ git commit -m”Initial import”


  25. ‣ Blob ‣ Tree ‣ Commit ‣ Tag

  26. 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

  27. Collaborating Two authors

  28. Make simultaneous changes to the file.

  29. Collaborating Redux Untrusted collaborators

  30. Untrusted changes to the file.

  31. Changelist Three stage thinking

  32. Working Staging Repo add commit edit

  33. None

  34. ‣shopping cart ‣ put things in ‣ take things out

    ‣ purchase at register

  35. 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

  36. Workspaces The power of simple branch toggling

  37. Local Remote Upstream

  38. # Creating a branch! git branch <BRANCHNAME>

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

    8c2d1 commit 1bdcd commit 2daa1

  40. What do cheap branches enable?

  41. ‣ Experimentation ‣


  42. ‣ Experimentation ‣ Safe experimentation

  43. Better reuse of units of work

  44. Work Models Enabling different development styles

  45. product v1.0 integration story1 story2 v1.5 integration story3

  46. Local Remote Upstream Integ Product Integ Product Integ Product

  47. Local Remote Upstream Idea Story Feature Feature Feature Integ Product

    Integ Product Integ Product

  48. Local Remote Upstream Idea Story Feature Feature Feature Integ Product

    Integ Product Integ Product

  49. Central Repo C e n t r a l i

    z e d

  50. Blessed Repo D i c t a t o r

    s h i p

  51. Certified Repo Development Repo t e g r a t

    i o n M a n a g e d Continuous
 Integration
 Server

  52. C u s t o m + P u b

    l i c C o n t r i b Customized ☚ Private Public ☛ GitHub

  53. Mirror Development Repo M i r r o r e

    d Mirror Certified Repo

  54. Client Apps GUIs and other front-ends

  55. http://windows.github.com

  56. http://windows.github.com

  57. http://mac.github.com

  58. http://mac.github.com

  59. Remotes Bandwidth and geographic challenges

  60. Local Remote Upstream

  61. Local Remote Upstream

  62. Local Remote Upstream

  63. data from http://whygitisbetterthanx.com/#git-is-fast Init git svn Status git svn Diff

    git svn Tag git svn Log git svn Commit (Lg) git svn Commit (Sm) git svn Branch git c svn c Speed

  64. Local Remote Upstream commit fetch push clone clone clone push

    pull pull pull

  65. Commit Push Pull

  66. Commit Push Pull

  67. Commit Push Pull

  68. Integration CI, scripting, and hooks

  69. None

  70. "This is so important, we can't entrust it to automation.

    We need our top developer to supervise it."

  71. continuous integration servers jenkins travis ci circleci buildhive

  72. None
  73. None
  74. None
  75. None
  76. None

  77. Summary The Git and GitHub ecosystem

  78. education@github.com education.github.com @matthewmccull Q&A

  79. • http://education.github.com • education@github.com
 • http://git-scm.com/book • http://training.github.com Resources