Slide 1

Slide 1 text

Open Source Collaboration with Git and GitHub Nick Quaranto

Slide 2

Slide 2 text

whoami • 4th Year Software Engineering Major • From Buffalo – Snow is awesome – Go Bills • Rubyist • GitHub Blogger

Slide 3

Slide 3 text

Version control sucks.

Slide 4

Slide 4 text

But it doesn’t have to.

Slide 5

Slide 5 text

No content

Slide 6

Slide 6 text

History

Slide 7

Slide 7 text

I'm an egoistical bastard, and I name all my projects after myself. First Linux, now git. -Linus Torvalds

Slide 8

Slide 8 text

History • BitKeeper debacle • Design Goals: – CVS as an example of what not to do – Distributed workflow – Strong safeguards against corruption – Very high performance • In development since 2005

Slide 9

Slide 9 text

No content

Slide 10

Slide 10 text

Fast 1. Fast

Slide 11

Slide 11 text

Directed Acyclic Graph

Slide 12

Slide 12 text

Small 2. Small

Slide 13

Slide 13 text

Git Internals: Blobs 457aef93ff7ffbb289f7e1384f900679eacf044a main.c

Slide 14

Slide 14 text

Git Internals: Trees

Slide 15

Slide 15 text

Git Internals: Commits

Slide 16

Slide 16 text

Git Internals: Commits

Slide 17

Slide 17 text

Local 3. Local

Slide 18

Slide 18 text

The Staging Area

Slide 19

Slide 19 text

CHEAP. 4. Cheap Branching

Slide 20

Slide 20 text

Git Internals: Branches branchname HEAD

Slide 21

Slide 21 text

Branching

Slide 22

Slide 22 text

Distributed 5. Distributed

Slide 23

Slide 23 text

Git Internals: Remotes branchname HEAD remotes/server/name

Slide 24

Slide 24 text

Local vs. Remote

Slide 25

Slide 25 text

Any Workflow 6. Multiple Workflows

Slide 26

Slide 26 text

Centralized

Slide 27

Slide 27 text

Integration Manager

Slide 28

Slide 28 text

Benevolent Dictator

Slide 29

Slide 29 text

Failboat. It’s not perfect.

Slide 30

Slide 30 text

The downsides • Complexity • Windows FTL • What's an IDE? • Unreadable source • Needs some maintenance

Slide 31

Slide 31 text

No content

Slide 32

Slide 32 text

+

Slide 33

Slide 33 text

=

Slide 34

Slide 34 text

No content

Slide 35

Slide 35 text

No content

Slide 36

Slide 36 text

No content

Slide 37

Slide 37 text

No content

Slide 38

Slide 38 text

No content

Slide 39

Slide 39 text

How to Contribute 1. Fork a repository at GitHub 2. Clone and connect your local repository 3. Write tests, implement functionality 4. Commit your local changes 5. Push your changes to your fork 6. Make a pull request 7. Profit!!

Slide 40

Slide 40 text

Demo

Slide 41

Slide 41 text

git log • Kudos to Scott Chacon who made – http://git-scm.com – http://whygitisbetterthanx.com • And to Michael Hartl – for Building the Insoshi Social Network • Wikipedia too. [email protected] http://litanyagainstfear.com