Gitified by valentin bora

1,421 views

Published on

Introducere in Git, pentru GeekMeet Timisoara #12.

0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total views
1,421
On SlideShare
0
From Embeds
0
Number of Embeds
9
Actions
Shares
0
Downloads
12
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide

Gitified by valentin bora

  1. 1. Geek, Get ready to be Giti ed Valentin Bora
  2. 2. $ whoami
  3. 3. freelance web developer nederland Student la Computing & Psychology @valentinbora contact@valentinbora.com
  4. 4. încă un tool?
  5. 5. dacă n-ar nu s-ar povesti
  6. 6. VCS Version Control System
  7. 7. Câțiva jucători
  8. 8. the players Git SVN Mercurial Bazaar CVS
  9. 9. Today’s villain Subversion
  10. 10. Aaaaargh... Subversion I kill you!
  11. 11. Subversion are timp ca-n Ardeal
  12. 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. 13. Subversion copiază cod din alt proiect
  14. 14. Subversion branching is pleasure NOT!
  15. 15. ? We have a hero
  16. 16. (aplauze)
  17. 17. Git
  18. 18. Git is fast
  19. 19. Git is green - nu poluează
  20. 20. Git loves branches
  21. 21. Git copy-pasted code friendly
  22. 22. Git train friendly
  23. 23. Git
  24. 24. Centralised Workflow
  25. 25. Integration manager Workflow
  26. 26. Git frenzy
  27. 27. github.com/facebook github.com/yahoo github.com/techcrunch github.com/rails
  28. 28. cine mai folosește git
  29. 29. să fie clar git is not SVN not an evolution
  30. 30. let’s get dirty
  31. 31. set up shop $ git config --global user.name "Geek" $ git config --global user.email geek@geekland.com
  32. 32. attack of the clones $ git clone ssh://geekmeet@valentinbora.com/~/geekmeet.git
  33. 33. now push $ git push origin master
  34. 34. now pull $ git pull
  35. 35. 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
  36. 36. 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
  37. 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. 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. 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. 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. 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. 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. 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. 44. Întrebări ?
  45. 45. Thank you? @valentinbora contact@valentinbora.com

×