Introducere in Git, pentru GeekMeet Timisoara #12.

1. Geek,
Get ready to be
Giti ed
Valentin Bora

2. $ whoami

3. freelance web developer
nederland
Student la
Computing & Psychology
@valentinbora
contact@valentinbora.com

4. încă un tool?

5. dacă n-ar
nu s-ar povesti

6. VCS
Version
Control
System

7. Câțiva jucători

8. the players
Git
SVN
Mercurial
Bazaar
CVS

9. Today’s villain
Subversion

10. Aaaaargh...
Subversion
I kill you!

11. Subversion
are timp
ca-n Ardeal

12. ./translations/.svn/text-bas
./translations/.svn/text-bas
Subversion ./translations/.svn/text-bas
./translations/.svn/text-bas
./translations/.svn/text-bas
pune ./translations/.svn/tmp
./translations/.svn/tmp/prop
.svn ./translations/.svn/tmp/prop
./translations/.svn/tmp/text
in ./translations/en.mo
./translations/en.po
fiecare ./translations/nl.mo
./translations/nl.po
folder ./verdana.ttf
./views
./views/.DS_Store
./views/.svn
./views/.svn/all-wcprops
./views/.svn/entries

13. Subversion
copiază
cod din alt
proiect

14. Subversion
branching is pleasure
NOT!

16. ?
We have a hero

17. (aplauze)

18. Git

19. Git
is fast

20. Git
is green
- nu poluează

21. Git
loves branches

22. Git
copy-pasted code
friendly

23. Git
train
friendly

24. Git

25. Centralised
Workflow

26. Integration manager
Workflow

27. Git frenzy

28. github.com/facebook
github.com/yahoo
github.com/techcrunch
github.com/rails

29. cine mai folosește git

30. să fie clar
git is not SVN
not an evolution

31. let’s get dirty

32. set up shop
$ git config --global user.name "Geek"
$ git config --global user.email geek@geekland.com

33. attack of the clones
$ git clone ssh://geekmeet@valentinbora.com/~/geekmeet.git

35. now push
$ git push origin master

36. now pull
$ git pull

37. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

38. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

39. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

40. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

41. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

42. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

43. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

44. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

45. other stuff
$ git checkout -b branchy
$ git checkout master
$ git merge branchy
$ git svn clone repo-url --trunk=trunk --
branches=branches --tags=tags
$ git status
$ git reset HEAD <file>
$ git checkout -- <file>
$ git mergetool

46. Întrebări
?

47. Thank you?
@valentinbora
contact@valentinbora.com