The Foundations of Collaboration with GitHub • SIGCSE 2014

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

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
310
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
120
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
250
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
550
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
240
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
200
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
180
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
130

Other Decks in Programming

See All in Programming
Bc87ea9c7a0f85b8761b716a677c6694?s=48 adammc331
0
160
44f37c1fe3a6a56376bb41a338741355?s=48 ahiru
3
290
F2496b53b4e6d5a589d8dc1781c11978?s=48 tatsumi0000
1
280
4861686276b2f990387eaef28b099db0?s=48 niyarin
1
370
Cfbe23392787cb3ad4689c5f72463fcc?s=48 makicamel
1
740
0b26590a0a8b0f1da140ed5de9b68379?s=48 usamik26
0
160
3f4e0340909015791f1712c52b116da7?s=48 tamadon
1
310
1102d6e3810fcc652a8b2887d1642ade?s=48 47degacademy
0
200
8fb8810e5e06a997bc13831b9b51007f?s=48 keinuma
0
680
9ff3a9c6cbb2100fba18ad8f4bef0e4f?s=48 yucao24hours
3
590
53de6e9d0d7bedce85c7b29256448274?s=48 forrep
12
3.1k
Ff591abea4349790dfe3461aeab3b23f?s=48 jonathanvila
0
340

Featured

See All Featured
25c7c18223fb42a4c6ae1c8db6f50f9b?s=48 mojombo
356
62k
6804f1775cb4babfcc3851298566fbce?s=48 tanoku
257
24k
Fde6c3a50ca518a909ef35c22c0ee0e4?s=48 destraynor
145
19k
C7393b7ba7ec9c8890dd77d209fbb3c9?s=48 maltzj
499
36k
E195ae45320d9202eaa01c9f1d31a416?s=48 marktimemedia
5
190
E76911cbe088e5b850d966de3fc7435b?s=48 robhawkes
52
2.7k
F383c6a4dc55e331bbe2987b622cee6b?s=48 stephaniewalter
256
11k
812e1705ff0f8bc1bcf18587bde687d5?s=48 62gerente
583
200k
C0b42577cfc2b321be3474618107e933?s=48 samanthasiow
54
6k
0fe2973fa8d27d96547e43322341183a?s=48 swwweet
205
6.7k
B83d5b590577969ee79a5ad845411a7d?s=48 ammeep
653
54k
D47656e20ff5e42f125fc5ea0fd636c6?s=48 tmm1
61
7.5k

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