Git/GitHub入門-GitHubでたのしいチーム開発

岡山大学テクノロジーラボ(OTL)のGitとGitHubについての入門ワークショップのときのスライドです。

Transcript

1. Git/GitHub ௒ೖ໳ GitHubͰͨͷ͍͠νʔϜ։ൃ
2. ຊ೔ͷΰʔϧ
3. - Gitͨͷ͍͠ʂ - GitHubͰνʔϜ։ൃؾ͍࣋ͪʂ
4. git
5. git ͬͯͳΜ΍Ζ͔…
6. ෼ࢄόʔδϣϯ؅ཧγεςϜ …Α͚͍Θ͔ΒΜ
7. ཁ͢Δͱ ෼ࢄ ͯ͠ɺ όʔδϣϯ Λ ؅ཧ͢Δ γεςϜ ͷ͜ͱ
8. ʮόʔδϣϯ؅ཧʯͬͯ…ʁ
9. ීஈ΍ͬͯΔ͜ͱ
10. ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge
11. ϝϞ.txt ϝϞ ID: hoge ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge2015 ฤूதʜ
12. ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge ϝϞ.txt ϝϞ ID: hoge2015 ηʔϒʂʂ
13. ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge ϝϞ.txt ϝϞ ID: hoge2015 ؒҧ͑ͯͨʂʂ
    ໭͍͚ͨ͠Ͳ্ॻ͖ͯ͠Μ͡ΌΜʂʂʂ
14. όʔδϣϯΛ؅ཧ͍ͨ͠ͱ͖ɺ Ͳ͏͠·͔͢ʁ …Α͚͍Θ͔ΒΜ
15. ίϐʔͯ͠όοΫΞοϓΛ ͱ͓ͬͯ͘ Ҋͦͷ̍
16. ίϐʔΛͱ͓ͬͯ͘ ࠷৽൛index.html index.html (લͷ΍ͭ) index-old.html index20510620.html ฤू༻index.html index.html
18. ʮόʔδϣϯ؅ཧʯͱ͸
19. ηʔϒ͢Δͨͼʹɺ όʔδϣϯΛৼΓ·͢
20. ʮόʔδϣϯ؅ཧʯͱ͸… ϝϞ.txt มߋ͠·ͨ͠ʂ ϝϞ.txt ηʔϒ͠·ͨ͠ʂ ver. 2 ver. 1
21. ʮόʔδϣϯ؅ཧʯͱ͸… ϝϞ.txt ϝϞ.txt ΍͹͍ؒҧ͑ͯͨʂ
    ͔͠΋্ॻ͖ͪ͠Όͬ ͨΑʔʂʂ ver. 2 ver. 1
22. ͦΜͳͱ͖ʹgitͳΒ ϝϞ.txt Ұݸલʹηʔϒͨ͠ ͱ͜Ζ(ver.1)ʹ໭Δʂ ϝϞ.txt ͜ΕͰ҆৺ʂศརʂ ver. 2 ver. 1
23. ͢΂ͯͷมߋཤྺΛ؅ཧͰ͖Δ gitͷ͍͍ͱ͜Ζͦͷ̍
24. gitͷ͜ͱ͹ • ηʔϒ = ίϛοτ (commit) • ϦϙδτϦ = ϑΥϧμ
25. gitͷ͘͠Έ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge ࣗ෼ͷ1$ͷத push fetch
26. ΈΜͳ͕ΈΜͳͷPCͰ ωοτͳͯ͘΋࡞ۀͰ͖Δ gitͷ͍͍ͱ͜Ζͦͷ̎
27. ͜ΕͰgit࢖͑Δʂ
28. $ git add FILENAME $ git commit -m “message” $ git push 1. εςʔδϯάɾΤϦΞʹ௥Ճ 2. ϩʔΧϧͰมߋΛηʔϒ 3. ϩʔΧϧͷηʔϒΛϦϞʔτʹ΋ηʔϒ
29. $ git add FILENAME $ git commit -m “message” 1. εςʔδϯάɾΤϦΞʹ௥Ճ 2. ϩʔΧϧͰมߋΛηʔϒ
30. $ git add/commit ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT add/commit ࣗ෼ͷ1$ͷத
31. $ git add FILENAME $ git commit -m “message” $ git push 1. εςʔδϯάɾΤϦΞʹ௥Ճ 2. ϩʔΧϧͰมߋΛηʔϒ 3. ϩʔΧϧͷηʔϒΛϦϞʔτʹ΋ηʔϒ
32. $ git push 3. ϩʔΧϧͷηʔϒΛϦϞʔτʹ΋ηʔϒ
33. $ git push ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத push
34. GitHubͱ͸
36. GitHub͸ɺ GitͷϦϙδτϦ ΛϗεςΟϯά͢ΔαʔϏε
37. gitͷ͘͠Έ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge ࣗ෼ͷ1$ͷத push fetch (JU)VC
39. νʔϜ։ൃͲ͏΍Μͷ
40. νʔϜ։ൃͷ΍Γ͔ͨ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ (GitHub͕ϗετ) JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge fetch push
41. ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖
42. ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge fetch push ൴ঁͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge fetch push ϦϞʔτϦϙδτϦ (GitHub͕ϗετ)
43. ϦϞʔτϦϙδτϦ (GitHub͕ϗετ) ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge fetch push ൴ঁͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge fetch push ͜Ε͕෼ࢄʂʂʂ
44. νʔϜ։ൃϑϩʔ
45. νʔϜ։ൃϑϩʔ • ࣗ෼ͷΞΧ΢ϯτʹσʔλΛෳ੡ (fork) • ϩʔΧϧ(ࣗ෼ͷPCͷத)ʹσʔλΛ࣋ͬͯ͘Δ (clone) • ฤू͢Δ • มߋ಺༰Λίϛοτ(ηʔϒ)͢Δ (add/commit) • ίϛοτ಺༰ΛϦϞʔτ(GitHub্ͷιʔε)ʹ൓ө͢Δ (push) • Pull RequestΛͩ͢ (GitHubͷը໘͔Βʂ)
46. 1. ෳ੡͢Δ (fork) ฤू͍ͨ͠σʔλͷෳ੡Λࣗ෼ͷ GitHubͷΞΧ΢ϯτʹͭ͘Ε·͢ GitHubͷϖʔδ͔Βʂʂ
47. 1. ෳ੡͢Δ (fork) ϩʔΧϧϦϙδτϦ ϦϞʔτϦϙδτϦ ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧ
48. 1. ෳ੡͢Δ (fork) ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ ࣗ෼ͷ1$ͷத fork (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧ
49. $ git clone https://github… 2. ࣗ෼ͷPCʹ࣋ͬͯ͘Δ (clone) ϦϞʔτ(GitHub)͔Β ϩʔΧϧ(ࣗ෼ͷCP)ʹσʔλΛ͖࣋ͬͯ·͢ * URL͸GitHubͷϖʔδ͔Βίϐϖ͠·͢
50. 2. ࣗ෼ͷPCʹ࣋ͬͯ͘Δ (clone) ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ
51. 2. ࣗ෼ͷPCʹ࣋ͬͯ͘Δ (clone) ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத clone (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT
52. 3. ฤू͢Δ
53. 3. ฤू͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT
54. 3. ฤू͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT ฤूͨͬͨ͠ʂʂʂʂ
55. $ git commit -m “message” 4. ίϛοτ(ηʔϒ)͢Δ ϩʔΧϧʢࣗ෼ͷPCͷதʣͰ มߋ಺༰Ληʔϒʂ $ git add FILENAME commit(ηʔϒ)͢ΔϑΝΠϧΛબͿ
56. 4. ίϛοτ(ηʔϒ)͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT
57. 4. ίϛοτ(ηʔϒ)͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT add / commit ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT
58. $ git push 5. ϦϞʔτʹ൓ө͢Δ (push) ϩʔΧϧʢࣗ෼ͷPCʣͷதͷมߋΛ ϦϞʔτʢGitHub্ʣͷιʔεʹ൓ө͠·͢
59. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT
60. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT push
61. GitHubͷϖʔδ͔Βʂʂ 6. มߋΛऔΓࠐΜͰ΋Β͏ ʢpull requestʣ ΦϦδφϧͷϨϙδτϦʹ ʮ๻ͷมߋΛऔΓࠐΜͰ͘Εʂʯ ͱϦΫΤετ͠·͢
62. 5. มߋΛऔΓࠐΜͰ΋Β͏ʢpull requestʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT
63. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT PR มߋ͔ͨ͠Βऔ ΓࠐΜͰΑʔʂʂ
64. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM
    TUZMFDTT PR มߋ͔ͨ͠Βऔ ΓࠐΜͰΑʔʂʂ 0,
65. 0. ΈΜͳͷมߋΛऔΓࠐΉ $ git pull upstream master ΦϦδφϧͷํͷϦϞʔτʢGitHub্ʣ͕มߋ͞Ε ͍ͯͨΒ࠷৽൛Λࣗ෼ͷιʔεʹऔΓࠐΉ $ git remote add upstream https:// github.com/okadai-techlab/okayama-u- techlab.com.git ͯ͘Β΅ͷΦϦδφϧͷํ΋ϦϞʔτઌͱͯ͠ొ࿥͢Δ * ొ࿥͸࠷ॳͷҰճ͚ͩͰ͍͍Αʂ ‘upstrem’໊ͬͯલ͡Όͳͯ͘΋͍͍Αʂ
66. 5. มߋΛऔΓࠐΜͰ΋Β͏ʢpull requestʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT ΦϦδφϧʢຊମʣ upstream JOEFYIUNM
    TUZMFDTT ୭͔͕มߋͨ͠
    ʢ࠷৽൛ʣ ෳ੡ origin
67. 5. มߋΛऔΓࠐΜͰ΋Β͏ʢpull requestʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM
    TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC
    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT pull ΦϦδφϧʢຊମʣ upstream ෳ੡ origin
68. ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge push ൴ঁͷϩʔΧϧϦϙδτϦ JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT commit merge pull push ϦϞʔτϦϙδτϦ (GitHub͕ϗετ) upstream JOEFYIUNM
    TUZMFDTT JOEFYIUNM
    TUZMFDTT push pull push PR PR ෳ੡ origin
69. νʔϜ։ൃϑϩʔ • ࣗ෼ͷΞΧ΢ϯτʹσʔλΛෳ੡ (fork) … 1ճ໨͚ͩ • ϩʔΧϧ(ࣗ෼ͷPCͷத)ʹσʔλΛ࣋ͬͯ͘Δ (clone) … 1ճ໨͚ͩ • ࠷৽൛ΛऔΓࠐΉ (pull) • ฤू͢Δ • มߋ಺༰Λίϛοτ(ηʔϒ)͢Δ (add/commit) • ίϛοτ಺༰ΛϦϞʔτ(GitHub্ͷιʔεorigin)ʹ൓ө͢Δ (push) • ΈΜͳͷมߋΛऔΓࠐΉ (Pull RequestΛͩ͢) -> pullʹ໭Δ
70. Demo