Intro to Git and Github

Intro to Git and Github Jenn Strater @codeJENNerator

@codeJENNerator https://speakerdeck.com/jlstrater/intro-to-git-2017 Follow Along

@codeJENNerator About Me

@codeJENNerator About Me Starting at Zenjob in Berlin in June
2017!

@codeJENNerator About Me - Taking classes at the Technical University
of Denmark and working on a research project - Also exploring Danish Culture with funding from the US Fulbright Grant program - Prior to the Fulbright Grant, I was a senior consultant at Object Partners, Inc. in Minneapolis, MN, USA. My work there is the subject of this talk. - Co-founder of Gr8Ladies and talk about women in the Groovy Community all over the world - Passionate about bring new people into the Groovy community through free introductory workshops called Gr8Workshops. - Moving to Berlin and starting at Zenjob in June 2017.

@codeJENNerator Background

@codeJENNerator Background • Programming Languages • Java • Python •
JavaScript • R

@codeJENNerator Background • Programming Languages • Java • Python •
JavaScript • R • Source Control • Git • Hg • Svn

@codeJENNerator What is Version Control?

@codeJENNerator https://vimeo.com/41027679

@codeJENNerator Why use Versioning?

@codeJENNerator How can we version? • Change file names (file1,
file2, filea, fileb, etc) • Use a tool with automatic save and revert i.e. Google Docs, Share Latex • Use a dedicated version control system

@codeJENNerator Types of Version Control

@codeJENNerator Centralized

@codeJENNerator Examples • Subversion (SVN) • Concurrent Versions System (CVS)

Problems

@codeJENNerator Problems • Checkouts • Merges

@codeJENNerator Distributed

@codeJENNerator Advantages • easy to manage • better merge conﬂict
resolution

@codeJENNerator Examples • Git • Mercurial (Hg)

@codeJENNerator

@codeJENNerator Overview • a free and open source project •
a protocol for versioning documents • can be used locally without a server • uses a tree structure • more videos: https://git-scm.com/videos

@codeJENNerator Terms

@codeJENNerator Terms • init

@codeJENNerator Terms • init • clone

@codeJENNerator Terms • init • clone • branch

@codeJENNerator Terms • init • clone • branch • add

• commit

• commit • master

• commit • master • stash

• commit • master • stash • fetch

• commit • master • stash • fetch • pull

• commit • master • stash • fetch • pull • push

• commit • master • stash • fetch • pull • push • merge

@codeJENNerator • Init - start a new project locally •
Clone - copy everything to your local computer • Branch - create a space to make your changes without affecting anything else • Add - add ﬁles to be saved • Commit - create a save point • Master - the main branch (by default) for everyone

@codeJENNerator • Stash - save your changes and come back
to them later • Fetch - get any changes from the server • Pull - fetch any changes from your teammates and merge it into your current local copy • Merge - include changes into a branch • Merges can happen when you want to include your changes in the team project (after a push) • Merges also happen when you want to get your team members work onto your own machine (after a pull)

@codeJENNerator Gui Source Tree

@codeJENNerator Command Line >git init

@codeJENNerator Github img src: https://www.ﬂickr.com/photos/24874528@N04/17125924230

@codeJENNerator Github • a private for-proﬁt company • hosts git
source code repositories • helps you work as a team or with public groups • can also convert from svn, hg, or tfs to git • has a great UI for assisting with some common tasks • The logo is called the octocat ;)

Proﬁles

Organizations

@codeJENNerator Repositories • private or part of an organization •
can be ‘forked’ to make a copy from an existing project

@codeJENNerator Read the docs for more on.. • Complex Branching
and Rebasing • Enterprise Features • Using other git repositories like Bitbucket

@codeJENNerator Conclusion

@codeJENNerator

@codeJENNerator • There are many ways to version documents

@codeJENNerator • There are many ways to version documents •
No matter the way, pick one that works for you.

@codeJENNerator • There are many ways to version documents •
No matter the way, pick one that works for you. • Commit early, commit often!

@codeJENNerator Questions? https://ﬂic.kr/p/5DeuzB

@codeJENNerator Time for Tutorials!

@codeJENNerator Hello World - Github GUI • https://guides.github.com/activities/hello-world/

@codeJENNerator Code Academy (Free) • https://www.codecademy.com/learn/learn-git

@codeJENNerator Basic Tutorial with Command Line • http://product.hubspot.com/blog/git-and-github- tutorial-for-beginners

@codeJENNerator Learn Git with Bitbucket • https://www.atlassian.com/git/tutorials/learn-git-with- bitbucket-cloud

@codeJENNerator Advanced

@codeJENNerator Stashing • https://www.atlassian.com/git/tutorials/git-stash

@codeJENNerator Complete Example • https://www.learnenough.com/git-tutorial • Starts very basic, but
scroll down for more advanced topics

@codeJENNerator List of More Tutorials • https://gist.github.com/jaseemabid/1321592

@codeJENNerator Command Cheat Sheet • https://github.com/kennyyu/bootcamp-git/wiki/ Basic-git-workﬂow

@codeJENNerator More Videos • https://git-scm.com/videos

Intro to Git and Github

Intro to Git and Github

More Decks by jlstrater

Other Decks in Technology

Featured

Transcript