Git and GitHub for Better Collaboration

Transcript

delivery author 5 year Git evangelist VP of Training at GitHub

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

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

diﬀ ‣Lightweight issue tracking

centralized VCSs use sequential revision numbers

9AB223D28B1AA46EF1780B22F304982E39872C34

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

</html> 9AB223D28B1AA46EF1780B22F304982E39872C34

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

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

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

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

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

8c2d1 commit 1bdcd commit 2daa1

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

None

Simpler merges

— No engineer, ever Wow! Version control!

DAG

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 Δ Δ Δ Δ Δ Δ Δ

Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin

Checkin Delta storage gets slower as the history of a ﬁle gets longer

None

Copy of the entire tree per commit

Why?

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

hard link to existing identical blobs

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 ß

zlib deﬂates each blob at commit

v1 v2 v3 v4 File A File B File C

zlib deﬂates the entire repo

v1 v2 v3 v4 File A File B File C

Act I 2100 MB became 205 MB

None

Rebasing

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

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

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

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

None

PRDD (Pull Request Driven Development)

Agile ‛ GIT

Idea ‛ Markdown

Review ‛ Pull Request

None

Visualizations

None

Subversion

SVN ‛ GIT

None

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

it.

Migration Tools

git-svn

git-svn Core Git feature

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

git-svn Consumes an authors email mapping ﬁle

(no author) = Codehaus infra <support@codehaus.org> sdevijver = Steven Devijver

<support@codehaus.org> markcc = Mark CC <support@codehaus.org> joe = Joe <support@codehaus.org> ajtarter = Aaron J Tarter <support@codehaus.org> liddon = Lidia Donajczyk-Lipinska <support@codehaus.org> jshickey = Scott Hickey <jshickey@yahoo.com> HamletDRC = Hamlet D'Arcy <hamletdrc@gmail.com> aalmiray = Andres Almiray <aalmiray@gmail.com> blackdrag = Jochen Theodorou <blackdrag@gmx.org> bob = Boc McWhirter <bob@codehaus.org> brownj = Jeff Brown <jeff@jeffandbetsy.net> cstein = Christian Stein <sormuras@gmx.de>

Git and GitHub for Better Collaboration

Git and GitHub for Better Collaboration

More Decks by Matthew McCullough

Other Decks in Programming

Featured

Transcript