• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Git Version Control System
 

Git Version Control System

on

  • 1,577 views

Git - Distributed Source Version Control System - The first public seminar of KMS Technology in 2013.

Git - Distributed Source Version Control System - The first public seminar of KMS Technology in 2013.

Statistics

Views

Total Views
1,577
Views on SlideShare
1,571
Embed Views
6

Actions

Likes
3
Downloads
34
Comments
1

1 Embed 6

http://www.linkedin.com 6

Accessibility

Categories

Upload Details

Uploaded via as Adobe PDF

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel

11 of 1 previous next

  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Git Version Control System Git Version Control System Presentation Transcript

    • Distributed SourceVersion Control System Apr 2013
    • Who am iLâm Phương DuySoftware Architectduylam@kms-technology.com Use Git from 2009 http://vn.linkedin.com/in/duylamphuong Confidential 2
    • Objectives To use Git in software project as doing with SVN or TFS To self study Git for advanced needs Confidential 3
    • SyllabusGit theory Daily development workflow Daily collaboration workflowMore on Git Confidential 4
    • Git’s history Source Version Control in Linux kernel projectuse patches and archived files revoke BitKeeper, Linus Torvald started developing Git1999 2002 now 2005 use BitKeeper (a commercal system) Confidential 5
    • SyllabusGit theory Daily development workflow Daily collaboration workflowMore on Git Confidential 6
    • Version Control SystemsCentralized Version Distributed Version Control Systems Control Systems Confidential 7
    • Git theory Data = Snapshot No network Three states Confidential 8
    • Git theory Data = Snapshot No network Three states Confidential 9
    • Git theory Data = Snapshot No network Three states git add git rm git status Confidential 10
    • SyllabusGit theory Daily development workflow Daily collaboration workflowMore on Git Confidential 11
    • Launch Git shell Confidential 12
    • Git in daily development git log git init git status git clone git commit git diffSetup repository Change repository Check repository git checkout git add git checkout git reset git rm git mv Undoing Update staging area Confidential 13
    • Git remote url protocolsLocal /data/git/project.gitSSH user@server:project.git Git git://server/project.gitHTTP http://server/project.git Confidential 14
    • Remote repository git fetchgit remote add <url> git pullgit clone git push Get remote repository Get updates Confidential 15
    • Authenticate with remote repository1) Generate key files with ssh-keygen2) Upload %USER_HOME%/.ssh/id_rsa.pub to remote repository hosting Read more: https://help.github.com/articles/generating-ssh-keys Confidential 16
    • SyllabusGit theory Daily development workflow Daily collaboration workflowMore on Git Confidential 17
    • Branch (git branch)1 4 snapshot2 3 git checkout master Confidential 18
    • Merging - Fast forwardgit merge hotfix Confidential 19
    • Merging - Non fast forwardgit merge iss53(resolve conflicts if any) Confidential 20
    • Remote branch workflowsCreate default remote branchGet changes from remote repositoryMerge changes from remote branch in local (two methods)Update changes to remote repository Confidential 21
    • Create default remote branch remote branch remote branch Time Confidential 22
    • Get changes from remote repository git fetch origin Time Confidential 23
    • Merge changes from remote branch in local (v.1) origin/master master git merge origin/master Time Confidential 24
    • Merge changes from remote branch in local (v.2) git fetch + git pull origin git merge origin/master master Time Confidential 25
    • Update changes to remote repository master git.ourcompany.com git push origin/master origin/master master origin/master master Time Confidential 26
    • Remote tracking branch• Use tracking branch to let Git know which server and branch to push / pull• Create remote tracking branch: > git checkout -b [branch] [remote name]/[branch] Confidential 27
    • SyllabusGit theory Daily development workflow Daily collaboration workflowMore on Git Confidential 28
    • Useful features> git tag> git stash> git submodule Confidential 29
    • Common problems> git push! [rejected] master -> master (non-fast forward)Error: failed to push some refs to ‘git@gitproxy:rip747/cfwheels.git’ > git pull Merge made by recursive > git push To git@gitproxy:rip747/cfwheels.git 1717535..1406e8c master -> master Confidential 30
    • Common problems (cont.)• To remove remote branch e.g origin/iss105 > git push origin :iss105• Use git tag to mark releases Confidential 31
    • ReferenceFor everything you want to read more about Git http://git-scm.com Confidential 32
    • THANK YOU