svn 능력자를 위한 git 개념 가이드

  • Published on
    17-Dec-2014

  • View
    71.484

  • Download
    14

DESCRIPTION

, . . .

Transcript

1. svn git 2. svn git . 3. . http://ggamangi.tistory.com . 4. git svn . . git != svn 5. git . , svn . 6. svn git . 7. svn . git . ? here! here! 8. git ? . remote repository 9. . push commit 10. svn git (DVCS) . 11. ? 12. . . git svn git svn Commit Log 4x 325x git . 13. . . 14. svn . ! 15. . . ! 16. git , . . (Staging Area) (index) . 17. svn git . 18. ? A B ! . 19. ? . login.php menu.php head.php tail.php style.css script.js body.php A B 20. ? . svn ? login.php menu.php head.php tail.php style.css script.js body.php A B login.php svn revert login.php . 21. ? git ? login.php menu.php head.php tail.php style.css script.js body.php A B staging area 22. . -a . git commit -a 23. , . push . git push 24. svn git svn commit git add git commit git push 25. . . : fetch : merge git pull pull 26. svn git svn update git merge git fetch git pull 27. svn ? . . git ! 28. snapshot git . 29. 1 2 3 4 5 A B C 1 2 1 2 3 2 1 svn () . 30. 1 2 3 4 5 A B C git . A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 31. 1 2 3 4 5 A B C 1 2 1 2 3 2 1 svn 5 . . 32. 1 2 3 4 5 A B C A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 . . git 5 . 33. . ? git branch . . 34. root svn trunk sources bin images branch1 branch2 branch3 svn . , . , . 35. c1 git c2c0 c4 c3 c5 master branch git . , . svn trunk git master 36. c1 git c2c0 c4 c3 c5 checkout master checkout branch branch master . checkout svn , git . 37. svn git . svn git , 38. c1 git c2c0 c4 c3 c5 c6 svn merge , git merge . merge branch 3-way merge : HEAD 39. git . . . . svn ? branch merge merge commit . 40. git : git branch git checkout git branch -d git checkout -b git checkout master git merge branch git branch git branch --no-merged git branch --merged branch , merge , . 41. merge . branchtrunk login.php menu.php head.php tail.php style.css script.js body.php login.php menu.php head.php tail.php style.css script.js body.php 42. svn . >>> 54. branch:login.php master login.php branch login.php git mergetool merge . master branch , === add , commit 55. rebase rebase merge . , ? merge , rebase . ? , rebase . rebase . 56. rebase c1 c3 c4 c2 c5 c7 c6 c8 master b1 b3 b2 c1 c3 c4 c2 c5 c7 c6 c8 master b1 b3 b2 c9 c10 c11 c1 c3 c4 c2 c5 c6 c9 c7 c8 c10 b3 masterb2b1 merge rebase merge rebase . 57. tag branch tag . git tag git tag -a git tag -d -a , , . git tag 58. git . , , , & git ... 59. git . git init git remote add git pull // , // , // . . ? 60. . git clone // . ex) git clone /local/repository/path ex) git clone user@hostname:/remote/repository/path svn checkout ? . 61. . git checkout -- // , ? svn , git . git reset HEAD // , git fetch origin git reset --hard origin/master // commit , 62. git , . . . . . stashing ! 63. git . . . svn . svn . 64. . , svn , git ... 65. Git http://git-scm.com/ git - http://rogerdudler.github.com/git-guide/index.ko.html Pro Git http://git-scm.com/book/ko Git: Rebase ? http://dogfeet.github.com/articles/2012/git-merge-rebase.html