The document discusses distributed version control systems like Git. It provides an overview of version control and its benefits for collaboration. It then discusses key aspects of Git such as its history, how it takes snapshots of project files, basic commands like init, add, commit, branching, merging, and working with remote repositories. It also outlines a feature branch workflow for Git.

1. +
Distributed Version Control
Nuttapon Pattanavijit

2. Reference
•
http://git-scm.com
•
https://www.atlassian.com/git/tutorial

3. 1. WTF is Version
Control ?

4. Collaboration

5. If someone blow up
your code!
what will you do if you use something like dropbox?

6. Snapshot sounds good

7. Snapshot sounds good?

8. Local Version Control

9. Centralized Version Control
Systems

10. Distributed Version Control System
git is DVCS

11. 2. Git?

12. History of Git
•
Developed for Linux Kernel
project.
•
Speed, Simple design
•
Non-linear development
•
Fully distributed
•
Able to handle large projects

13. Snapshot of project over time
basically takes a picture of what all your files look like at that moment and
stores a reference to that snapshot. To be efficient, if files have not
changed, Git doesn’t store the file again—just a link to the previous
identical file it has already stored.

14. Git workflow
1. You modify files in your
working directory.
2. You stage the files, adding
snapshots of them to your
staging area.
3. You do a commit, which takes
the files as they are in the
staging area and stores that
snapshot permanently to your
Git directory.

15. 3. Git Basic

17. Git Basic
git init
initializes new repository
git clone create a copy

18. Git Basic

19. Git Basic
git add
add files to staging
git commit snapshot project

23. 4. Undoing changes

24. Undoing Changes
git checkout
previous version
git revert
undo committed
snapshot
git reset
undo changes in
working directory

25. 5. Branching

27. git branch testing

29. git checkout testing

30. git commit -a -m “made a change”

31. git checkout master

32. git commit -a -m “made other changes”

33. 6. Merging

35. git checkout master
git merge iss53

36. git checkout master
git merge iss53

37. If two branches edit
same file?
How to handle merge conflict?

38. 7. Remote
Repositories

39. Demo

40. Remote Repositories
git pull
fetch + merge into
current branch
git push
update local repo
to remote repo

42. 8. Feature Branch
Workflow

43. git checkout -b my_feature master
=
git checkout master
git branch my_feature

44. git push -u origin master

45. git pull

46. git push -u origin my_feature
git checkout master
git pull
git merge my_feature
git push