2. Who am i
Lâm Phương Duy
Software Architect
duylam@kms-technology.com
Use Git from 2009
http://vn.linkedin.com/in/duylamphuong
Confidential 2
3. Objectives
To use Git in software
project as doing with
SVN or TFS
To self study Git for
advanced needs
Confidential 3
4. Syllabus
Git theory
Daily development workflow
Daily collaboration workflow
More on Git
Confidential 4
5. Git’s history
Source Version Control in Linux kernel project
use patches and archived files revoke BitKeeper, Linus Torvald
started developing Git
1999 2002
now
2005
use BitKeeper (a commercal system)
Confidential 5
6. Syllabus
Git theory
Daily development workflow
Daily collaboration workflow
More on Git
Confidential 6
23. Get changes from remote
repository
git fetch origin
Time
Confidential 23
24. Merge changes from remote
branch in local (v.1)
origin/master master
git merge origin/master
Time
Confidential 24
25. Merge changes from remote
branch in local (v.2)
git fetch
+ git pull origin
git merge
origin/master master
Time
Confidential 25
26. Update changes to remote
repository
master
git.ourcompany.com
git push origin/master
origin/master master
origin/master master
Time
Confidential 26
27. 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
28. Syllabus
Git theory
Daily development workflow
Daily collaboration workflow
More on Git
Confidential 28