Git and GitHub
Twitter: @wbsimms
Skype: William.Barrett.Simms
VCS History – Stone Age
VCS History – First Generation
Networking
• None
Operation
• Pessimistic locking
• Only one person can work on a file at a...
VCS History – Second Generation
Networking
• Centralized
Operation
• Optimistic locking
•

Concurrent development resolved...
VCS History – Current Generation
Networking
• Distributed Repository
Operation
• Optimistic locking
•

Concurrent developm...
How it works

Make
Changes

Commit

Push

Conflict Resolution

Make
Changes

Commit

Push! –
Uh-oh

Pull

Resolve
Conflict...
What’s GitHub?

Centralized Repository
• Group authorization
• Public and Private Repositories
•

•

Integrations
•

•

Hu...
Git Features
• Fast, Easy, Local Branching
• “git branch <name>“

• Local History
• “git log”

• Merging
• “git merge”

Se...
My toolset

• git-scm
• Command-line
• http://git-scm.com

• TortoiseGit
• Shell integration
• http://code.google.com/p/to...
Demo
• Command-line
• TortoiseGit
Upcoming SlideShare
Loading in...5
×

Git and GitHub for .NET Developers

351

Published on

Git and GitHub are wildly popular right now with all types of developers. I want to discuss how git (and GitHub) can be used in the .NET world.

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total Views
351
On Slideshare
0
From Embeds
0
Number of Embeds
6
Actions
Shares
0
Downloads
4
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git and GitHub for .NET Developers

  1. 1. Git and GitHub Twitter: @wbsimms Skype: William.Barrett.Simms
  2. 2. VCS History – Stone Age
  3. 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. 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. 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
  6. 6. How it works Make Changes Commit Push Conflict Resolution Make Changes Commit Push! – Uh-oh Pull Resolve Conflicts Push
  7. 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. 8. Git Features • Fast, Easy, Local Branching • “git branch <name>“ • Local History • “git log” • Merging • “git merge” Several UIs and integrations available
  9. 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
  10. 10. Demo • Command-line • TortoiseGit
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×