Git the fast version control system

Git the fast version control system

• 1.
  GitThe fast versioncontrol systemJeroen Rosenberg jeroen.rosenberg@gmail.com
• 2.
  Table of contentsShortintroduction to version controlVersion control systemsComparison with subversionDistributed version controlGit usageBasic operationsSolving conflictsBranching as a core conceptToolingConclusionGit - the fast version control system
• 3.
  Version controlShort introductionGit- the fast version control system
• 4.
  Version control (1)Themanagement of changes to documents, programs, and other information stored as computer filesA system that maintains versions of files at progressive stages of development.Every fileHas a full history of changesCan be restored to any versionA communication tool, like email, but with code rather than human conversationGit - the fast version control system
• 5.
  Version control (2)BenefitsGit- the fast version control system
• 6.
  Version control (2)BenefitsAllowsa team to share codeGit - the fast version control system
• 7.
  Version control (2)BenefitsAllowsa team to share codeMaintains separate “production” versions of code that are always deployableGit - the fast version control system
• 8.
  Version control (2)BenefitsAllowsa team to share codeMaintains separate “production” versions of code that are always deployableAllows simultaneous development of different features on the same codebaseGit - the fast version control system
• 9.
  Version control (2)BenefitsAllowsa team to share codeMaintains separate “production” versions of code that are always deployableAllows simultaneous development of different features on the same codebaseKeeps track of all old versions of filesGit - the fast version control system
• 10.
  Version control (2)BenefitsAllowsa team to share codeMaintains separate “production” versions of code that are always deployableAllows simultaneous development of different features on the same codebaseKeeps track of all old versions of filesPrevents work being overwrittenGit - the fast version control system
• 11.
  GlossarySome commonly usedterms explained before moving onGit - the fast version control system
• 12.
  Key terms inversion controlBranch acopy of a set of files under version control which may be developed at different speeds or in different waysCheckout to copy the latest version of (a file in) the repository to your working copyCommit to copy (a file in) your working copy back into the repository as a new version Merge to combine multiple changes made to different working copies of the same files in the repositoryRepository a (shared) database with the complete revision history of all files under version controlTrunk the unique line of development that is not a branchUpdate to retrieve and integrate changes in the repository since the update.Working copy your local copies of the files under version control you want to editGit - the fast version control system
• 13.
  Version control systemsGit- the fast version control system
• 14.
  Very limited andinflexibleConcurrent Versions System (CVS)Git - the fast version control system
• 15.
  Very limited andinflexibleConcurrent Versions System (CVS)Fills most of the holes found in CVS, but added nothing to its development model Subversion (SVN)Git - the fast version control system
• 16.
  Very limited andinflexibleConcurrent Versions System (CVS)Fills most of the holes found in CVS, but added nothing to its development model Subversion (SVN)More feature rich and functionalGitGit - the fast version control system
• 17.
  Comparison with SVNSubversionGitGit- the fast version control system
• 18.
  Comparison with SVNSubversionCentralizedGitDistributedGit- the fast version control system
• 19.
  Comparison with SVNSubversionCentralizedBranchingcan be a pain and is used sparinglyGitDistributedBranching is very easy and is a core conceptGit - the fast version control system
• 20.
  Comparison with SVNSubversionCentralizedBranchingcan be a pain and is used sparinglyConflicts frequently occur and renaming is not handled wellGitDistributedBranching is very easy and is a core conceptConflicts occur less frequent, renaming is properly handledGit - the fast version control system
• 21.
  Comparison with SVNSubversionCentralizedBranchingcan be a pain and is used sparinglyConflicts frequently occur and renaming is not handled wellCan be slow due to network latencyGitDistributedBranching is very easy and is a core conceptConflicts occur less frequent, renaming is properly handledVery fast since less operations involve network latencyGit - the fast version control system
• 22.
  Comparison with SVNSubversionCentralizedBranchingcan be a pain and is used sparinglyConflicts frequently occur and renaming is not handled wellCan be slow due to network latencyCan consume quite some disk spaceGitDistributedBranching is very easy and is a core conceptConflicts occur less frequent, renaming is properly handledVery fast since less operations involve network latencyConsumes 30 times less disk spaceGit - the fast version control system
• 23.
  Distributed version controlThe new generation of version controlGit - the fast version control system
• 24.
  A basic, centralizedversion control systemUsers commit changes to the central repository and a new version is born to be checked out by other usersGit - the fast version control system
• 25.
  A distributed versioncontrol systemEach user has a full local copy of the repository. Users commit changes and when they want to share it, the push it to the shared repository Git - the fast version control system
• 26.
  Git usageBasic operationsGit- the fast version control system
• 27.
  Tracking a project..Git- the fast version control system
• 28.
  Tracking a project..Mirrorthe central serverAnything the main repository can do, you can do!Git - the fast version control system
• 29.
  Tracking a project..Myproject is tiny - git is overkill“Why would I carry a Swiss knife when I only want to open cans?”Git - the fast version control system
• 30.
  Tracking a project..Tinyprojects should be scalable too!“You wouldn’t use Roman digits just because you perform calculations with small numbers, now would you?”Tiny projects may grow beyond your expectations“One day you’ll desperately need that hex wrench and you’re stuck with your plain can-opener”Git - the fast version control system
• 31.
  Tracking a project..Prettystraightforwarded, huh?Git - the fast version control system
• 32.
  Advanced committing…What ifyou screw up?#re-edit the metadata and update the tree$ git commit --amendor# toss your latest commit away without changing the working tree$ git reset HEAD^ Git - the fast version control system
• 33.
  Solving conflictsInstant mergingGit- the fast version control system
• 34.
  Closer look atpulling..Git - the fast version control system
• 35.
  Auto-merging..What actually happens…#Fetch latest changes from origin$ git fetch# Merge fetched changes into current branch$ git merge refs/heads/masterGit - the fast version control system
• 36.
  Auto-merging..What actually happens…Recursivemerge strategy – create a merged reference tree of common ancestors for three-way merge fewer merge conflicts
• 37.
  can detectand handle renamesGit - the fast version control system
• 38.
  Resolving conflicts..Suppose Jeffand Dan both made changes to the same line in file…CONFLICT (content): Merge conflict in fileAutomatic merge failed; fix conflicts and then commit the result.Uh oh…. now what?Git - the fast version control system
• 39.
  Resolving conflicts..Well, justmerge manually…# run your favourite file merge application$ git mergetool –t opendiffGit - the fast version control system
• 40.
  Git - thefast version control systemsource: http://gitguru.com
• 41.
  Resolving conflicts..…and commit!#commit to resolve the conflict$ git commitGit - the fast version control system
• 42.
  BranchingA core conceptGit- the fast version control system
• 43.
  Creating a branch..Git- the fast version control system
• 44.
  Creating a branch..Orcreate and switch to a branch based on another branch$ git checkout –b new_branch other_branchGit - the fast version control system
• 45.
  Some common scenarios…Git- the fast version control systemWhy would I require branching?
• 46.
  Scenario 1 –Interrupted workflowYou’re finished with part 1 of a new feature but you can’t continue with part 2 before part 1 is released and tested Git - the fast version control system
• 47.
  Scenario 1 –Interrupted workflowYou’re finished with part 1 of a new feature but you can’t continue with part 2 before part 1 is released and tested Git - the fast version control system
• 48.
  Scenario 2 –Quick fixesWhile you’re busy implementing some feature suddenly you’re being told to drop everything and fix a newly discovered bugGit - the fast version control system
• 49.
  Scenario 2 –Quick fixesWhile you’re busy implementing some feature suddenly you’re being told to drop everything and fix a newly discovered bugGit - the fast version control system
• 50.
  Git usage overviewJustto summarize…Git - the fast version control system
• 51.
  Git command sequenceSource:http://git.or.czGit - the fast version control system
• 52.
  ToolingStuck at ‘YeOlde Terminal’? Not necessarily…Git - the fast version control system
• 53.
  Git UI front-endsGit- the fast version control system
• 54.
  OpenInGitGuiGit -the fast version control systemFinder extension
• 55.
  OpenInGitGuiGit -the fast version control systemFinder extension TortoiseGit
• 56.
  Git ExtensionsWindowsExplorer extensions
• 57.
  OpenInGitGuiGit -the fast version control systemFinder extension TortoiseGit
• 58.
  Git ExtensionsWindowsExplorer extensions JGit / EGitEclipse integration