git your .net on!sddconf.com/brands/sdd/library/git_your_dotnet_on.pdf · everyday git workflows...

Git Your .NET On!

James Bender

@JamesBenderJames@JamesCBender.com

github.com/JamesBender

What is Git?

Content Tracking System

Non-File Locking

Distributed

What We Will Cover

Basic Git concepts and terms

Creating a repository on GitHub

Everyday Git workflows with three tools

What We Will Not Cover

Branching and deployment strategies

All of the Git tools available

Source Control governance or practices

Git Terms and Concepts

Repository

Create locally on your hard drive

Create on Github, clone to your local drive

Git Terms and Concepts

Remote RepositoryGit is distributed; no pre-determined “centralized” repository

Services like Github and Bit Bucket allows you to create repos in the cloud

Git Terms and Concepts

Remote RepositoryYou can “link” your local repository to as many remote repositories as you like

Each repository contains a complete history of the project

Git Terms and Concepts

Remote Repository

Main(Github)

Fred Wilma Barney Betty

Origin

git@github.com:JamesBender/GitRepoOne.git

Git Terms and Concepts

Commits

Commit track a series of changes to the directories or files in your repository

Git Terms and Concepts

Branches

Creates a separate commit history independent of the main history

Can be merged back into the main history at a later time

Git Terms and Concepts

Branches

Git Terms and Concepts

Why use Branches?Separate code by release

Enables you to develop specific features independent of main branch

Allows you to isolate the work of contributors pending a code review

Git Terms and Concepts

Branches

Git Terms and Concepts

Rebase

Allows you to alter where a sequence of commits is based from

Provides a clean, linear, easier to understand commit history

Git Terms and Concepts

Rebasing

A B C D

E F

Git Terms and Concepts

Rebasing

A B C D

E F

Git Terms and Concepts

Three ways to “Git”

Command Line – Git for Windows

Windows App – Github for Windows

Within Visual Studio – VS Tools for Git

Three ways to “Git”

Command Line – Git for Windows

Windows App – Github for Windows

Within Visual Studio – VS Tools for Git or TFS Explorer

Three ways to “Git”

Command Line – Git for Windows

Windows App – Github for Windows

Within Visual Studio – VS Tools for Git or TFS Explorer

Where to get Git

Command Line – msysgit.github.io

Windows App – windows.github.com

VS Tools for Git - bit.ly/1ih95zC

Other Helpful Links

Git Immersion - gitimmersion.com

https://www.atlassian.com/git/tutorial

Thank you!

• www.JamesCBender.com

• github.com/JamesBender

• james@jamescbender.com

• Twitter: @JamesBender

• hallwayconversations.com