すごいGit楽しく学ぼう

B16717ef4b7aab0b253d933c3934f280?s=47 mixi_engineers
May 12, 2015
Programming
48
27k

 すごいGit楽しく学ぼう

blog記事: http://alpha.mixi.co.jp/entry/20150513

B16717ef4b7aab0b253d933c3934f280?s=128

mixi_engineers

May 12, 2015
Tweet

More Decks by mixi_engineers

See All by mixi_engineers
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
0
100
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
0
390
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
3
1.9k
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
1
190
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
10
2.5k
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
3
2.8k
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
3
2.1k
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
1
2.3k
B16717ef4b7aab0b253d933c3934f280?s=48 mixi_engineers
0
250

Other Decks in Programming

See All in Programming
E6143330e12cd226c3dab99f3fe8cb3e?s=48 yanaemon
1
140
Fc358d63dcdcbad7a5c29198785dec2c?s=48 naototty
1
240
0a98ad166f9cdf8d27d92c37438c6e9d?s=48 matsumana
0
320
F9e11bea0c22333596791dd0696f5d4f?s=48 daiksy
0
1.2k
E0e036f89c14b3e59640318eedf9670b?s=48 bkuhlmann
2
210
C302e84057a922dce0ecbe80207e3fcc?s=48 mu_zaru
0
110
Db8efd836c9a09b71e3d8e1c60d6ea84?s=48 colinfay
0
130
D83b3739651001461f48763639b90b50?s=48 mazipan
4
930
D9e4d5a4b36f83fbde1076815df1362f?s=48 bmack
0
180
Bdd3fb3269e67bbc512f2530c409a926?s=48 tnishinaga
3
3.4k
C302e84057a922dce0ecbe80207e3fcc?s=48 mu_zaru
0
270
Ce6acc3536b0e0340b5f0569d3394c9c?s=48 yasi
2
240

Featured

See All Featured
Be9caeb9d4ef9944d151af909063ed6e?s=48 samlambert
236
9.7k
4394ceb8b277f35ee3da7030384efb5d?s=48 davidbonilla
68
3.4k
0bce06bd06ee7a2c4f5500f25dcf7f18?s=48 paulrobertlloyd
70
3.3k
Dad095ea7038f89f760419ce475d5d14?s=48 michaelherold
224
8.2k
D8fc2580cfaca035f666d9e4ee79a7f7?s=48 mongodb
23
3.7k
3ab1249be442027903e1180025340b3f?s=48 reverentgeek
164
6.7k
9128d500301ae51524e887bb680f471d?s=48 caitiem20
300
16k
B83d5b590577969ee79a5ad845411a7d?s=48 ammeep
652
54k
3d4519fd34b76fb265fc0237f3792bd4?s=48 danielanewman
1
280
8081b26e05bb4354f7d65ffc34cbbd67?s=48 chriscoyier
681
180k
39488f9d172ab92fd352f2cd7b73258d?s=48 mza
80
3.9k
A415db3ac9e9668acbc1fb36eead84ac?s=48 mthomps
37
2.2k

Transcript

  1. Learn You a Git for Great Good!

  2. ͦ΋ͦ΋ɺGitͬͯ ԿͷͨΊʹ͋ΔΜͩΖ͏ʁ

  3. Git͸ɺνʔϜͰͭͷ։ൃʹ औΓ૊Ή͜ͱΛՄೳʹ͠·͢ʂ

  4. Git͕ແ͍ͱʜʜ Կ͕มΘ͔ͬͨ෼͔Μͳ͍ʂ ٸʹಈ͔ͳ͘ͳͬͨΜ͚ͩͲʜʜ ࠓ͔Βࢲ͕։ൃ͢ΔͷͰɺΈΜͳ։ൃΛࢭΊͯʂ ͜ͷίʔυ୭͕ॻ͍ͨΜͩΖ͏ʁ

  5. ਖ਼௚ਏ͍ʂ

  6. Git͕͋Ε͹ʂ ;Ή;Ήɺ͜͏͍ͬͨมߋ͕ՃΘͬͨͷ͔ʂ ಈ͔ͳ͘ͳ͚ͬͨͲɺ͙͢ʹલʹ໭ͤͨʂ ਺ඦਓͰ΋Ұॹʹ։ൃͰ͖ΔΑʂ ͜ͷΫιίʔυΛॻ͍ͨͷ͸ɺ˓˓͞Μ͔ʜʜ

  7. ΈΜͳͰ։ൃͰָ͖͍ͯ͠ʂ ✌ Т✌ ࡾ✌ Т ✌ࡾ ✌`Т ✌

  8. w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

  9. w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

  10. ࢖ͬͯΈΑ͏ʂͷͦͷલʹ $ git config --global user.name "Amy Mikushi" $ git

    config --global user.email "amy@mixi.co.jp" Gitʹࣗݾ঺հ ͜͜Ͱొ࿥ͨ͠৘ใ͕(JUͷૢ࡞ʹ͍ͭͯճΔʂ

  11. ͸͡ΊͯΈΑ͏ $ mkdir books $ cd books $ git init

    GitϦϙδτϦΛ࡞੒͠Α͏ ϦϙδτϦ͸ɺόʔδϣϯ؅ཧ͢ΔͨΊͷ ஷଂݿͷ͜ͱͰ͢

  12. $ find . Α͘Ͱ͖·ͨ͠ʂ ͜ΕͰbooks

  13. ঢ়ଶͷ֬ೝ $ git status git

  14. ϑΝΠϧͷ௥Ճ Untracked

  15. ௥ՃΛ֬ೝ Changes

  16. ͸͡Ίͯͷίϛοτ εςʔδϯάΤϦΞʹஔ͍ͨϑΝΠϧΛεφοϓγϣο τͱͯ͠ɺGit

  17. εςʔδϯάΤϦΞͱϦϙδτϦ Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git add ίϛοτ͢Δ४උ͕Ͱ͖ͨΒgit

  18. εςʔδϯάΤϦΞͱϦϙδτϦ Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git add ίϛοτ͢Δ४උ͕Ͱ͖ͨΒgit

  19. Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git commit add

  20. Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git commit add

  21. ྺ࢙ΛΈΑ͏ มߋΛอଘͰ͖ΔΑ͏ʹͳΓ·ͨ͠ʂ มߋΛίϛοτͱͯ͠ͲΜͲΜੵΈॏͶ͍ͯ͘͜ͱ͕େࣄͰ͢ ͲΜͳมߋ͖͚ͯͨͬ͠ʜʁͱͳͬͨΒྺ࢙ΛৼΓฦΓ·͠ΐ͏ʂ $ git log աڈͷมߋ ίϛοτ ͕ҰཡͰ͖·͢

    ผͷϑΝΠϧΛ௥Ճ͢ΔίϛοτΛߦ͍ɺ࠶౓

  22. ϦϞʔτϦϙδτϦΛ࢖ͬͯΈΔ ಉ͡ঢ়ଶ͕ϦϞʔτʹ΋อଘͰ͖·͢ ͍ͭͰ΋໭ͤΔ͠ɺଞͷਓ΋Ҿͬுͬͯ͜Ε·͢ ·ͣ͸ɺGitHubͰϕΞϦϙδτϦΛ࡞੒͠Α͏ʂ https://github.com/new ϕΞϦϙδτϦ͸࡞ۀ༻σΟϨΫτϦΛ࣋ͨͳ͍ .gitͷΈͷϦϙδτϦͰ͢

  23. ϦϞʔτϦϙδτϦΛొ࿥͢Δ ϕΞϦϙδτϦΛ࡞੒ͨ͠ΒϦϞʔτϦϙδτϦͱͯ͠ ొ࿥͠Α͏ $ git remote add origin \ git@github.com:<your

    account>/books.git ొ࿥ͨ͠ϦϞʔτϦϙδτϦ͸ɺ$

  24. खݩͷมߋΛ্͛ͯΈΑ͏ $ git push -u origin master ϦϞʔτϒϥϯνΛࣗಈͰ௥੻͢ΔΑ͏ʹઃఆ͢Δ ͔࣍Βpull

  25. ڞಉ։ൃ͜ͱ͸͡Ί $ cd .. $ git clone git@github.com:<your account>/books.git alt_books

    GitΛ࢖͏͜ͱͰෳ਺ਓͰ͔ΜͨΜʹ։ൃͰ͖·͢ʂ ࠓ͔Βผਓ ͷؾ࣋ͪ ʹͳͬͯମݧͯ͠Έ·͠ΐ͏ ·ͣ͸ϦϞʔτϦϙδτϦΛखݩʹऔΓࠐΈ·͢ alt_booksͱ͍͏໊લͰϦϙδτϦΛෳ੡(clone)Ͱ͖ ͨʂ

  26. ڞಉ։ൃ͜ͱ͸͡Ί $ cd alt_books $ vim Crusoe.txt $ git add

    Crusoe.txt $ git commit $ git push Ͱ͸ɺalt_booksͰ࡞ۀΛ͍͖ͯ͠·͠ΐ͏ pushͨ͠ΒɺGitHubͰ֬ೝͯ͠ΈΑ͏ʂ

  27. มߋΛऔΓࠐΉ $ cd ../books $ git pull ଞਓͷߦͬͨ࡞ۀ alt_booksͰߦͬͨ࡞ۀ Λ

    booksʹऔΓࠐΜͰΈ·͠ΐ͏ ͦΕʹ͸pull

  28. มߋΛ֬ೝʂ $ vim Sherlock.txt $ git diff diff

  29. มߋΛ֬ೝʂ1BSU $ git add Sherlock.txt $ git diff --staged ͨͩ୯ʹgit

  30. ݩʹ໭͢ $ git reset Sherlock.txt ૉ੖Β͍͠ʂमਖ਼ՕॴΛ͙͢ʹ֬ೝ͢Δ͜ͱ͕Ͱ͖ΔΑ ͏ʹͳΓ·ͨ͠ ࣍͸ݩʹ໭͢ํ๏Λ֮͑·͠ΐ͏ addΛऔΓফ͢ʹ͸git

  31. ݩʹ໭͢ $ vim Sherlock.txt $ git checkout -- Sherlock.txt ͜ΕͰ޷͖ͳ͚ͩBEEΛͨ͠ΓɺBEEΛऔΓফͨ͠ΓͰ

    ͖·͢ ࣍͸ϑΝΠϧࣗମΛલճͷίϛοτঢ়ଶʹ໭͢ํ๏Ͱ͢ ίϛοτͯ͠ͳ͍มߋ͸ফ͑ͪΌͬͯݩʹ໭ͤͳ͍ʂ

  32. ϒϥϯνΛ࡞Ζ͏ Gitͷ࢖͍ํΛ΄ͱΜͲϚελʔ͠·ͨ͠ʂ ࠷ޙʹGitͷϒϥϯνػೳΛֶͼ·͠ΐ͏ ϒϥϯν͸ɺݱࡏͷίϐʔΛ࡞੒͢ΔػೳͰ͢ ػೳ௥Ճ΍όάमਖ਼ͷࡍ͸ϒϥϯνΛ੾ͬͯ࡞ۀΛਐΊ·͢ ੾ͬͨϒϥϯν͔Β͸͍ͭͰ΋ݩͷmasterϒϥϯνʹ໭ͬ ͯ͘Δ͜ͱ͕Ͱ͖·͢ master͸σϑΥϧτͷϒϥϯν໊Ͱ͢

  33. ϒϥϯνΛ࡞Ζ͏ $ git branch clean_up ϒϥϯνΛ੾Δʹ͸ɺgit

  34. ϒϥϯνΛ੾Γସ͑ͯΈΑ͏ $ git checkout clean_up clean_up

  35. ϑΝΠϧͷ࡟আ $ git rm '*.txt' $ git commit -m "Remove

    all files" clean_up

  36. ϒϥϯνͰߦͬͨ࡞ۀΛऔΓࠐ΋͏ $ git checkout master clean_up

  37. ϒϥϯνͰߦͬͨ࡞ۀΛऔΓࠐ΋͏ $ git merge clean_up clean_up

  38. ϒϥϯνͷ࡟আ $ git branch -d clean_up ඞཁͷͳ͘ͳͬͨclean_upϒϥϯνΛ࡟আ͠Α͏ git

  39. ࠷ޙͷpush $ git push ࠷ޙʹࠓ·ͰߦͬͨมߋΛGitHubʹ΋൓өͤ͞Α͏ʂ Git͕࢖͑ΔΑ͏ʹͳͬͨʂ

  40. w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

  41. ίϛοτͱϒϥϯνͬͯ Ͳ͏͍͏࢓૊ΈͳΜͩΖ͏ʁ

  42. ίϛοτͱϒϥϯνΛཧղ͢Δ͜ͱͰ GitΛγϯϓϧʹཧղͰ͖·͢

  43. ίϛοτͱ͸ʁ ίϛοτ͸༷ʑͳ৘ใΛ͍࣋ͬͯ·͢ w ϦϏδϣϯ w Tree

  44. ίϛοτͱ͸ʁ ίϛοτ͸༷ʑͳ৘ใΛ͍࣋ͬͯ·͢ w ϦϏδϣϯ w Tree

  45. ίϛοτʹ͸਌͕͍Δ ͭલͷίϛοτͷϦϏδϣϯΛ࣋ͭͷͰίϛοτʹ͸ ਌͕͍Δʂ    ৽͍͠ίϛοτ͔Βݹ͍ίϛοτ͸؆୯ʹ୧ΕΔ

  46. ࠷ݹͷίϛοτ·Ͱ୧ΕΔ ίϛοτΛ୧͍ͬͯ͘ͱඞͣҰ൪࠷ݹͷίϛοτ·Ͱ ୧Γண͚Δʂ ࠷ݹ ͋ΔͭͷίϛοτΛݟΕ͹ɺͦͷྺ࢙͕෼͔Δ

  47. ίϛοτ͸෼͔͚ͬͨͲ ϒϥϯν͸ʁ

  48. ୯ͳΔಛఆͷίϛοτΛࢦͨ͠ ϙΠϯλͷΑ͏ͳ΋ͷͰ͢ʂ

  49. ϒϥϯν σϑΥϧτͷϒϥϯν໊͸master ϒϥϯνͷઌ಄Λࢦ͢ϦϑΝϨϯε͸ɺ ςΩετͰϦϏδϣϯ SHA-1 ͕อଘ͞Ε͍ͯ·͢   

  50. ϒϥϯν ৽ͨͳnewͱ͍͏໊લͷϒϥϯνΛ࡞੒ͯ͠ΈΔ $ git branch new   

  51. ϒϥϯν $ git branch new     

    ৽͍͠ͷ͕ग़དྷͨʂ ৽ͨͳnewͱ͍͏໊લͷϒϥϯνΛ࡞੒ͯ͠ΈΔ

  52. ϒϥϯνͷجຊ͸͜Ε͚ͩʂ ୯ͳΔϙΠϯλͳͷͰɺϒϥϯν໊͕ ࢖͑Δॴ͸ϦϏδϣϯ͕࢖͑Δ͠ ͦͷٯ΋વΓ

  53. ϒϥϯνͷࢬ෼͔Ε      ͜ͷঢ়ଶ͔ΒOFXʹίϛοτ͍ͯ͘͠ͱʜʜ

  54. ϒϥϯνͷࢬ෼͔Ε       Μʁ

  55. ϒϥϯνͷࢬ෼͔Ε        ࢬ෼͔Εͨ͠ʂ

  56. ϒϥϯνͷࢬ෼͔Ε newϒϥϯν͚ͩมߋ͞Ε masterϒϥϯνʹ͸Өڹ͕ͳ͍ʂ       

  57. ࢲ͸Ͳ͜ʹ͍ΔΜͰ͠ΐ͏͔ʜʜ git

  58. HEADϦϑΝϨϯε         $

    git checkout master

  59. HEADϦϑΝϨϯε         $

    git checkout master

  60. HEADϦϑΝϨϯε HEADͷҐஔ͕੾ΓସΘͬͨʂ HEAD͕෇͍͍ͯΔϒϥϯν͸ಛघͳಈ͖Λ͢Δ ෼͔Γ΍͍͢Α͏ʹ·ͣଞʹϒϥϯνΛ੾ͬͯΈΔ      

       $ git branch other

  61. HEADϦϑΝϨϯε ͜͜Ͱίϛοτͯ͠ΈΔͱʜʜ        

      master

  62. HEADͰࢀর͞Ε͍ͯΔϒϥϯν͸ ίϛοτ͢ΔͨͼʹҠಈ͢Δ

  63. ίϛοτͱϒϥϯνʹ͍ͭͯ ෼͔ͬͨʂ

  64. w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

  65. ྺ࢙ΛऔΓࠐΉϚʔδͬͯ Ͳ͏͍͏࣌ʹ࢖͏ΜͩΖ͏ʁ

  66. ΘΓͱͲ͜Ͱ΋࢖͏ʂ

  67. ɾνʔϜͰ։ൃ͍ͯ͠Δ࣌ʹ ଞͷਓͷมߋΛऔΓࠐΉͱ͖ ɾਓͰ։ൃ͍ͯ͠Δ࣌ʹෳ਺ͷ ϒϥϯνΛͭʹ·ͱΊΔͱ͖

  68. ΘΓͱΑ͋͘Δύλʔϯ Αʔ͠ɺमਖ਼΋ऴΘͬͨ͠αʔόʹ push

  69. push

  70. ͳͥpushͰ͖ͳ͍ʁ         remote

    repo my repo ͢Ͱʹ৽͍͠ ίϛοτ͕ʂ

  71. ͜ͷঢ়ଶͰ͸pushͰ͖·ͤΜ Ͳͷίϛοτ͕masterϒϥϯνͷ࠷৽͔෼͔Βͳ͘ͳ Δ͔ΒͰ͢ ҎԼͷΑ͏ͳঢ়ଶΛ࡞Δ͜ͱ͸ग़དྷ·ͤΜ      

      

  72. Ͳ͏ͨ͠Β͍͍ͷʁ Ұ౓खݩʹremote

  73. มߋΛऔΓࠐΉ         remote

    repo my repo $ git pull origin master

  74.     remote repo my repo  

        มߋ͕औΓࠐ·Εͨʂ

  75.     remote repo my repo  

        $ git push origin master

  76.       remote repo my repo

          pushͰ͖ͨʂ

  77. ΈΜͳͰ։ൃ ͭͷϒϥϯνΛผʑʹมߋͨ࣌͠͸ɺ ଞਓͷมߋΛϚʔδͯ͠push

  78. ͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

  79. ͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

  80. merge

  81.          $

    git merge topic --ff merge

  82.          தͷਓ

    ʮtopicϒϥϯνͬͯmasterͷࠩ෼શ෦ ɹؚΜͰΔ͠ɺҰॹʹͪ͠Ό͑͹Α͘Ͷʁʯ merge

  83. தͷਓ ʮϚʔδͨ͠Αʔʯ        

     merge

  84. merge

  85. ͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

  86. merge

  87. merge

  88. merge

  89. merge

  90.          

     merge

  91. merge

  92. ͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

  93. merge

  94.          

    $ git merge topic --squash merge

  95. தͷਓ ʮtopicͷมߋ಺༰Λѹॖ͠Α͏ʂʯ தͷਓʮͭͷύονʹѹॖͰ͖ͨʂʯ     merge

  96.          

    merge

  97. merge

  98. merge

  99. merge

  100. Ϛʔδ͢Δ಺༰Λѹॖ͠ɺࠩ෼Λݱࡏͷίϛοτʹ ৐͚ͬΔʂ ࠩ෼͸εςʔδϯάΤϦΞʹ৐ͤΒΕΔ͚ͩͳͷͰɺ ίϛοτ͸ࣗ෼Ͱ΍Δඞཁ͕͋Δ merge

  101. ͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

  102. ϦϕʔεͬͯԿʁ ϚʔδͱԿ͕ҧ͏ͷʁ

  103. rebase         '

    ͜Ε͕Ϧϕʔεʂ

  104. ࣮ࡍϦϕʔε͕Ͳ͏͍͏͜ͱΛ ͢Δͷ͔ͭͣͭݟ͍ͯ͜͏

  105. rebase topicϒϥϯνΛrebase͍ͨ͠        

     

  106. rebase         

     $ git rebase master

  107. ' rebase ·ͣίϛοτͷมߋ಺༰ΛͦΕͧΕύονʹ͢Δ

  108. rebase topicϒϥϯνΛmasterͱ ಉ͡ҐஔʹҠಈͤ͞Δ       

        

  109. rebase ࡞੒͓͍ͯͨ͠ύονΛͭͣͭ ॱʹద༻ͯ͠ίϛοτ͍ͯ͘͠       

      

  110. rebase  ࠩ෼Λద༻ͯ͠ίϛοτ       

      

  111. rebase '

  112. rebase ' 

  113. rebase '

  114. ର৅ͷϒϥϯνͷ্ʹݱࡏͷϒϥϯνΛ࡞Γ௚͠·͢ rebaseʹΑͬͯ࡞ΒΕͨίϛοτ͸ಉ͡಺༰͚ͩͲผͷ ίϛοτʹͳΔͷͰ஫ҙͰ͢ʂ git

  115. ผͷίϛοτʹͳΔ w ϦϏδϣϯ w Tree

  116. ΍ͬͯ͸͍͚ͳ͍rebase ίϛοτͷ৘ใ͕มΘͬͯ͠·͏ͷͰɺ طʹpush͞Ε͍ͯΔϒϥϯνΛrebaseͯ͠͸͍͚·ͤΜ ଞਓ͕push

  117. w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

  118. Gitͷ৭ʑͳٕΛֶ΅͏ʂ

  119. ͜Ε͚ͩ͸֮͑Α͏ $ git

  120. gitίϚϯυͰ͸ɺGitͷΑ͘࢖͏ίϚϯυΛҰཡ͢Δ ͜ͱ͕ग़དྷ·͢ ίϚϯυͷৄࡉͳઆ໌Λݟ͍ͨ࣌͸ɺmanΛར༻͠· ͠ΐ͏ ྫ͑͹ɺmergeίϚϯυʹ͍ͭͯৄ͘͠஌Γ͍ͨͱ͖͸ ϋΠϑϯͰܨ͛ͯೖྗ͠·͢ $ man git-merge ͜Ε͚ͩ͸֮͑Α͏

  121. git

  122. git

  123. Ϛʔδ͢Δ࣌ʹ(JU͚ͩͰ͸ղܾͰ͖ͳ͍͜ͱ͕͋Γ·͢ ͦΕ͕ίϯϑϦΫτͰ͢ ίϯϑϦΫτͨ͠৔߹͸ਓ͕ؒղܾ͢Δඞཁ͕͋Γ·͢ ίϯϑϦΫτ͸΋͏͍΍ͩ ೣ͸ղܾ͠ͳ͍

  124. ίϯϑϦΫτͨ͠ϑΝΠϧ͸ɺboth

  125. ίϯϑϦΫτΛमਖ਼ͯ͠ɺίϛοτ͠·͢ ίϯϑϦΫτ͸΋͏͍΍ͩ b <<<<<<< HEAD ccc ======= c >>>>>>> topic

    d b ccc d ίϯϑϦΫτղܾ࣌ʹɺίϯϑϦΫτղܾҎ্ͷ͜ͱΛͯ͠͸ ͍͚·ͤΜ Ͳͷ਌ʹ΋ݱΕͳ͍มߋΛ͍ͯ͠ΔϚʔδΛevil

  126. git

  127. Φϓγϣϯͳ͠ͷgit

  128. git

  129. ͦΕʹ͸git

  130. Ͳ͏͠Α͏΋ͳ͘ͳͬͨ ؒҧͬͯϒϥϯνΛফͯ͠͠·ͬͨ ద౰ʹreset

  131. git

  132. 　ㅤ　ㅤ　ㅤ

  133. גࣜձࣾϛΫγΟͰ΋ ΄ͱΜͲͷ෦ॺ͕࢖͍ͬͯ·͢

  134. GitHubͷPull

  135.  ྡͷਓͷGitHubͷϓϩδΣΫτΛϑΥʔΫ͠·͢  ϑΥʔΫͨ͠ϦϙδτϦΛखݩʹΫϩʔϯ͠·͢  ࡞ۀ༻ϒϥϯνΛ࡞੒͠·͢  มߋΛՃ͑ͯίϛοτͯ͠ϓογϡ͠·͢  GitHub͔ΒPull

  136. w (JU#PPL w ͜Θ͘ͳ͍(JU w (JUͷ࢓૊Έ  ͖ͤ͜ͷٕज़೔ه w ݟ͑ͳ͍νΧϥʲ຋༁ʳ(JUΛϘτϜΞοϓ͔Βཧղ͢Δ

    w $PEF4DIPPM5SZ(JU ࢀߟจݙ ΈΜͳ΋ಡΜͰΈΑ͏ʂ