3. VCS History – First Generation
Networking
• None
Operation
• Pessimistic locking
• Only one person can work on a file at a time
Examples
• RCS, SCCS
4. VCS History – Second Generation
Networking
• Centralized
Operation
• Optimistic locking
•
Concurrent development resolved via
merge resolution
• Atomic Commits
•
All commits must be conflict resolved
Examples
• Subversion, ClearCase, TFS*
5. VCS History – Current Generation
Networking
• Distributed Repository
Operation
• Optimistic locking
•
Concurrent development resolved
via merge resolution
• Atomic Commits
•
All commits must be conflict
resolved
Examples
• Git, Mercurial
7. What’s GitHub?
Centralized Repository
• Group authorization
• Public and Private Repositories
•
•
Integrations
•
•
Huge!!! (Cool demos to follow)
Metrics
•
•
Social Coding
Great for Agile
Cheap
GitHub
8. Git Features
• Fast, Easy, Local Branching
• “git branch <name>“
• Local History
• “git log”
• Merging
• “git merge”
Several UIs and integrations available
9. My toolset
• git-scm
• Command-line
• http://git-scm.com
• TortoiseGit
• Shell integration
• http://code.google.com/p/tortoisegit/
• Git Source Control Provider
• Visual Studio 2013 integration
• Via Nuget