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

The Foundations of Collaboration with GitHub • SIGCSE 2014

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

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
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
330
Collaborative Software Development in a Social World at the Utah JUG
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
130
Git and GitHub Platform Review
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
270
Your First Pull Request
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
210
Git and GitHub Workflows at the Utah JUG
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
590
Agile-ish life at GitHub
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
260
Git and GitHub Agile Workflows for HP
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
220
Writing Tools on the GitHub Platform
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
Git Feature Branches as an Art
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
130

Other Decks in Programming

See All in Programming
リアルタイムボイスチェンジャーMMVCとVITSの紹介
A5f618dd37c9f9866423579247cb3fb0?s=48 stealthinu
0
160
チームでカレーを作ろう！アジャイルカレークッキング
D30220c903365b2170e791313296b2f9?s=48 akitotsukahara
0
900
NEWT.net: Frontend Technology Selection
A2040e0e2f7a6cabf81b54e4a401c0e8?s=48 xpromx
0
280
From Java through Scala to Clojure
6dd9394072d0d29aef3692f80298c36d?s=48 lagenorhynque
0
250
Swift Regex
0b26590a0a8b0f1da140ed5de9b68379?s=48 usamik26
0
210
Meet Swift Regex
0b26590a0a8b0f1da140ed5de9b68379?s=48 usamik26
0
370
Imperative is dead, long live Declarative! | Appdevcon
9da5d5cc4b6a9f28058152e28364b02a?s=48 prof18
0
120
Jetpack Composeでの画面遷移
A3799948f13d7633877b0eca0aa10333?s=48 iwata_n
0
200
Node.jsデザインパターンを読んで
3d06fa4b3230d37a8d940405cc4abcc6?s=48 mmmommm
0
2.8k
Baseline Profilesでアプリのパフォーマンスを向上させる / Improve app performance with Baseline Profiles
37618b4d60cf3d1f43f7196253264edc?s=48 numeroanddev
0
260
マルチプロダクト×非構造化データ×機械学習を支えるデータ信頼性
9b95bbde8856da418c299333b312da3f?s=48 akino
0
170
Managing Error Messages with your Oracle Database REST APIs
0ed10d1154c696886ca483fe827cb299?s=48 thatjeffsmith
0
160

Featured

See All Featured
A Tale of Four Properties
8081b26e05bb4354f7d65ffc34cbbd67?s=48 chriscoyier
149
21k
Docker and Python
Ecdea9b9714877b86cee08458f085481?s=48 trallard
27
1.6k
Building Your Own Lightsaber
Fe6b81005d1553accd6b2a28f6a2bef1?s=48 phodgson
94
4.6k
Statistics for Hackers
56c4053438af8e8b90d6f53cbb7573be?s=48 jakevdp
781
210k
How GitHub Uses GitHub to Build GitHub
78b475797a14c84799063c7cd073962f?s=48 holman
465
280k
Visualization
170b760e0147792d0140e59ec78e9893?s=48 eitanlees
125
11k
Ruby is Unlike a Banana
6804f1775cb4babfcc3851298566fbce?s=48 tanoku
91
9.2k
The Straight Up "How To Draw Better" Workshop
Aff5641764408271f7bc398f2097edd0?s=48 denniskardys
225
120k
5 minutes of I Can Smell Your CMS
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
196
18k
JazzCon 2018 Closing Keynote - Leadership for the Reluctant Leader
3ab1249be442027903e1180025340b3f?s=48 reverentgeek
172
8.5k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
E425fe9f170efa0dfaf8ab69d7107418?s=48 aki_i
24
15k
Designing for Performance
245cee81a9c424266e5e401d844ea881?s=48 lara
597
63k

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