Post on 09-Feb-2017
Easing into Git
Introduction
Kevin GrossnicklausEmail: kvgros@architectnow.netTwitter: @kvgros
Chris YoungEmail: cyoung@architectnow.net Twitter: @architectnow
Twitter: @architectnowURL: www.architectnow.netFB: www.facebook.com/architectnow
Agenda
• Introductions• Terminology• Finding or Installing Git• Using Git• Workflows• Other Tools• Resources
Expectations
What do we assume you know?
What we use?
WHAT IS GIT?
Brief Introduction to Git
• Age: 10 years (2005)• Alternatives– Git– SourceSafe– Team Foundation Server– Subversion (SVN)– Mercurial– CVS– Many Others
• Major Differences– Distributed vs Central– Platform and Tool Support– Branching Options
USING GIT
Terminology• Cloning• Remote• Origin• Fetch• Commit• Merge• Pull• Push
• Branch• Rebase• Fast Forward• Resets• Stash
Installing Git
• Server– Locally Hosted– GitHub– Visual Studio Online– BitBucket
• Client– Dev Tool• Visual Studio• Xamarin• Other
– Command Line• Powershell
– Other
Using Git
• Cloning• Pulling• Commits• Syncing with remotes• Resets/Reverts• Stashing
Workflows
• Git-Flow
ADDITIONAL RESOURCES
Other Tools
• Merge/Diff Tools– P4merge • https://gist.github.com/tony4d/3454372
• SourceTree• GitHub for Windows• Integrations
Resources
• Workflows – https://www.atlassian.com/git/tutorials/comparing-workflo
ws• Gitflow
– http://nvie.com/posts/a-successful-git-branching-model/• Cheatsheets
– http://www.git-tower.com/blog/git-cheat-sheet/• Pluralsight• Slack Integration• Boxstarter - http://www.boxstarter.org
– Script: https://gist.github.com/youngcm2/6c5ced52f3662cceb79b
THANK YOU
President
kvgros@architectnow.net
Kevin Grossnicklaus
http://architectnow.net or @kvgros
800.362.3919 x 101
636.236.3279