Post on 20-May-2015
INTRO TO VERSIONCONTROLWITH GIT AND GITHUB
by: | twitter: | github: joe fleming @w33ble w33ble
TAKEAWAYVCSGitGithub
EXPECTATIONSQuestions
WHAT IS VERSIONCONTROL?
"The task of keeping a software system consisting ofmany versions and configurations well organized."
History, Collaboration and State
HISTORY
HISTORYActivity logRollback
COLLABORATION
COLLABORATIONMultiple contributorsAvoid overwrites
WHY GIT?It's popularBranching/merging blissDistributed source control
BRANCHING
GIT WORKFLOW
DISTRIBUTEDWork locallyShare remotelyMultiple remotes
GITHUB
Free(ish)Great interfaceSocial coding
PULL REQUESTS
CODE REVIEW
CODE REVIEW
MERGING
BLAME
USING GIT
BASIC WORKFLOWAdd/Edit/Remove filesConfirm changesStage changesReview changesCommit changes
BASIC WORKFLOWSublime, vim, eclipse, etcgit diffgit addgit statusgit commit
BRANCHING ANDMERGING
git branchgit checkout -b
git mergegit branch -d
USING REMOTESgit fetchgit pullgit push
USEFUL RESOURCESGit - The Simple GuideGit Cheat SheetPro GitGit Flow
THANKS!
twitter: | github:
joe fleming
@w33ble w33ble