Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up
for free
The Foundations of Collaboration with GitHub • SIGCSE 2014
Matthew McCullough
March 08, 2014
Programming
1
81
The Foundations of Collaboration with GitHub • SIGCSE 2014
Matthew McCullough
March 08, 2014
Tweet
Share
More Decks by Matthew McCullough
See All by Matthew McCullough
matthewmccullough
1
310
matthewmccullough
2
130
matthewmccullough
1
250
matthewmccullough
0
190
matthewmccullough
1
550
matthewmccullough
2
240
matthewmccullough
0
200
matthewmccullough
0
180
matthewmccullough
0
130
Other Decks in Programming
See All in Programming
akatsukinewgrad
0
200
line_developers_tw2
0
710
azdaroth
0
130
akatsukinewgrad
0
190
itosho525
0
140
o0h
PRO
1
1.5k
asumikan
0
290
line_developers_tw
0
540
saki4869
0
190
ippey
0
180
junmikai
0
290
zsmb
1
130
Featured
See All Featured
62gerente
587
200k
dougneiner
119
7.8k
holman
448
130k
ufuk
56
5.4k
yeseniaperezcruz
302
31k
pauljervisheath
196
15k
roundedbygravity
84
7.8k
moore
125
21k
akmur
252
19k
paulrobertlloyd
71
3.6k
deanohume
295
27k
hatefulcrawdad
257
17k
Transcript
A foundation of collaboration presented to the delegates of SIGCSE
2014 Version control with
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
http://oreil.ly/ogitvid
http://amzn.to/oreillygit
Version Control A refreshed approach to VCS
None
Open Source
bash scripts ☛ C code
is not a slightly better
None
None
None
http://git-scm.com
Starting Up Creating a repository
Get a GitHub account.
Get a GitHub account. http://github.com/join
Create a new repo(sitory).
Add a file.
View the commit history (timeline).
Make changes to the file.
Repo Creation Local and remote initialization simplicity
# Green field project! $ git init newproject! $ cd
newproject! # ...start coding
or if you already have source code
# Legacy project tree! $ cd existingproject! $ git init!
! # Add all the code! $ git add .! $ git commit -m”Initial import”
‣ Blob ‣ Tree ‣ Commit ‣ Tag
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
Collaborating Two authors
Make simultaneous changes to the file.
Collaborating Redux Untrusted collaborators
Untrusted changes to the file.
Changelist Three stage thinking
Working Staging Repo add commit edit
None
‣shopping cart ‣ put things in ‣ take things out
‣ purchase at register
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
Workspaces The power of simple branch toggling
Local Remote Upstream
# Creating a branch! git branch <BRANCHNAME>
RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit
8c2d1 commit 1bdcd commit 2daa1
What do cheap branches enable?
‣ Experimentation ‣
‣ Experimentation ‣ Safe experimentation
Better reuse of units of work
Work Models Enabling different development styles
product v1.0 integration story1 story2 v1.5 integration story3
Local Remote Upstream Integ Product Integ Product Integ Product
Local Remote Upstream Idea Story Feature Feature Feature Integ Product
Integ Product Integ Product
Local Remote Upstream Idea Story Feature Feature Feature Integ Product
Integ Product Integ Product
Central Repo C e n t r a l i
z e d
Blessed Repo D i c t a t o r
s h i p
Certified Repo Development Repo t e g r a t
i o n M a n a g e d Continuous Integration Server
C u s t o m + P u b
l i c C o n t r i b Customized ☚ Private Public ☛ GitHub
Mirror Development Repo M i r r o r e
d Mirror Certified Repo
Client Apps GUIs and other front-ends
http://windows.github.com
http://windows.github.com
http://mac.github.com
http://mac.github.com
Remotes Bandwidth and geographic challenges
Local Remote Upstream
Local Remote Upstream
Local Remote Upstream
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
Local Remote Upstream commit fetch push clone clone clone push
pull pull pull
Commit Push Pull
Commit Push Pull
Commit Push Pull
Integration CI, scripting, and hooks
None
"This is so important, we can't entrust it to automation.
We need our top developer to supervise it."
continuous integration servers jenkins travis ci circleci buildhive
None
None
None
None
None
Summary The Git and GitHub ecosystem
education@github.com education.github.com @matthewmccull Q&A
• http://education.github.com • education@github.com • http://git-scm.com/book • http://training.github.com Resources