Try Git ハンズオン

Transcript

1. KFUG ϋϯζΦϯ GitΛ࢝ΊͯΈΑ͏ʂ
 (Git + SourceTree ϋϯζΦϯ) 1 sponsored by
2. 2 ✱ ࠓ͔Βͪΐͬͱ͠Ό΂ΔͷͰɺ
 ͦͷؒʹҎԼΛࢀߟʹ ✱ http://tinyurl.com/git160305 ✱ SourceTree ͷΠϯετʔϧΛɺ
 ·ͩͷํ͸΍͓͍͍ͬͯͯͩ͘͞ ͸͡Ίʹ
3. TAM + tambourine inc. ʹΑΔ
 εϙϯαʔυɾϋϯζΦϯͰ͢ 3
4. 4 ✱ גࣜձࣾTAM, גࣜձࣾλϯόϦϯ ✱ ύʔτφʔܕσδλϧϓϩμΫγϣϯ ✱ डୗͷWeb੍࡞͕ओͳ͓࢓ࣄɺ
 େख͔Βͷ௚੥͚Ҋ͕݅΄ͱΜͲ ✱ େࡕ / ౦ژ / γϯΨϙʔϧ Ͱ120ਓ௒ ✱ Git / Gulp / Angular / PHP / Laravel / 
 Slack / Heroku / AWS / monaca etc. ձࣾ঺հ
5. 5 TAM Coworking ✱ ؔ੢ϑϩϯτΤϯυUG ษڧձ, ΋͘΋͘ձ
 ຖ݄΍ͬͯ·͢ (࣍ճ͸3/21ॕ) ✱ http://www.tam-tam.co.jp/coworking/
6. 6 ✱ ϑϩϯτΤϯυɾόοΫΤϯυΤϯδχΞ ืूதʂ (JavaScript / PHP ͳͲ) ✱ σβΠφʔग़਎ˠϑϩϯτɾόοΫΤϯυ ྆ํ΍͍ͬͯΔਓͱ͔ɺόοΫΤϯυˠ
 σΟϨΫλʔస޲ͱ͔ɻ৭ʑܦݧͰ͖·͢ ✱ ϧʔϧͷগͳ͍ɺۃ୺ʹࣗ༝ͳձࣾͰ͢ ✱ “Wantedly TAM” Ͱݕࡧ͔ɺελοϑ·Ͱ ٻਓืू
7. 7 એ఻͓ΘΓ Git + SourceTree ϋϯζΦϯ ͸͡Ί·͢
8. 8 ✱ લड़ͷϖʔδ͸ݟΒΕ͍ͯ·͔͢ʁ
 http://tinyurl.com/git160305
 ✱ SourceTree ͷΠϯετʔϧ OK?
 Mac ver. 2.1 / Windows ver. 1.6 ର৅ ४උOK?
9. 9 ✱ όʔδϣϯ؅ཧπʔϧͷ໊લ ✱ ཤྺɾϩάΛ࣮֬ʹ࢒͢ ✱ ୭͕ɺͲ͜Λɺ͍ͭɺͲ͏มߋ͔͕ͨ͠
 ෼͔Δ (ߦ୯ҐͰʂ) ✱ ઌ૆ฦΓͳͲ͕ى͖ʹ͘͘ɺ҆৺ & ޮ཰త Gitͬͯ??
10. 10 ✱ Git ΛϚ΢εͰૢ࡞Ͱ͖Δ GUI ✱ ϩά΍ࠩ෼Λɺࢹ֮తʹ؆୯ʹ֬ೝͰ͖Δ ✱ Mac Ͱ΋ Windows Ͱ΋࢖͑Δ & ແྉ 
 
 
 SourceTreeͬͯ??
11. 11 GitϦϙδτϦͷ࡞੒ ϦϙδτϦͱ͸Git ͷ
 σʔλΛೖΕΔ૔ݿͷ͜ͱɻ
 ʮϑΝΠϧʯˠʮ৽ن࡞੒ʯ อଘઌϑΥϧμΛࢦఆ
12. 12 αϯϓϧίʔυΛindex.html ͱͯ͠อଘ
13. 13 ίϛοτ (ݱࡏͷঢ়ଶΛه࿥)
14. 14 ✱ index.html ͷޡࣈΛ֤ࣗฤू͍ͯͩ͘͠͞ ✱ ίϛοτ(ฤूཤྺΛه࿥)͍͖ͯ͠·͢ ✱ ࠩ෼Λ໨ࢹ ✱ εςʔδϯά ✱ ίϛοτ ✱ ίϛοτϩάΛ֬ೝ ฤूͯ͠ɺίϛοτ ͋ͳͨͷ1$ ϩʔΧϧϦϙδτϦʹ มߋͨ͠ϑΝΠϧΛొ࿥
15. 15 master ͜ΕΛ܁Γฦ͢ ίϛοτ͕ͲΜͲΜ࿈ͳ͍͖ͬͯ·͢ جຊ͸͜ͷ܁Γฦ͠Ͱ͢
16. 16 ϒϥϯν ຊ೔ͷ໨ۄͰ͢
17. 17 master 
 feature develop ϒϥϯνͱ͸ Git ͷίϛοτΛࢬ෼͔Εͤͨ͞΋ͷ
 ֤ϒϥϯν͸׬શʹผঢ়ଶͰɺޓ͍ʹӨڹ͞Εͳ͍
18. 18 master ϒϥϯν͕ͳ͍ͱ ৽ػೳΛ௥Ճ͍ͯ͠Δ్தʹɺ
 ۓٸͷमਖ਼͕ඞཁʹͳͬͨΒʁ
 ͦͷۓٸमਖ਼͚ͩΛΞοϓ͔ͨͬͨ͠Βʁ ۓٸमਖ਼ ৽ػೳ௥Ճ ৽ػೳ௥Ճ
19. 19 master ϒϥϯν͕ͳ͍ͱ ۓٸमਖ਼ ৽ػೳ௥Ճ ৽ػೳ௥Ճ ࣮͸ Git ͷ͏·Έ΋গͳ͍
20. 20 master 
 ϒϥϯν͕͋Δͱ ྫ) “master” ϒϥϯν͸ɺຊ൪αʔόͷσʔλͱಉ͡ (Ϛελʔσʔλ) ୈ1ϑΣʔε͕ެ։׬ྃ͠·ͨ͠ɺ
 ୈ2ϑΣʔζʹ޲͚ͨػೳ௥ՃΛ։࢝͠·͢ɻ
21. 21 master 
 feature ϒϥϯν͕͋Δͱ ػೳ௥ՃͷͨΊʹɺ”feature” ͱ͍͏ϒϥϯνΛ
 ࡞Γɺ͜ͷϒϥϯνͰ࡞ۀΛ։࢝͠·͢
22. 22 master fix 
 feature ϒϥϯν͕͋Δͱ ࡞ۀ్தɺٸᬎɺۓٸमਖ਼͕ඞཁʹͳΓ·ͨ͠ʂ
 master ͔Βɺ৽͘͠ “fix” ϒϥϯνΛ࡞੒͠·͢
23. 23 master fix 
 feature ϒϥϯν͕͋Δͱ fix ϒϥϯνͰमਖ਼Λߦ͍ɺmaster ʹ౷߹ɾެ։͠ ·͢ɻ(feature ϒϥϯνͷ಺༰͸ӨڹΛड͚·ͤΜ)
24. 24 master fix 
 feature ϒϥϯν͕͋Δͱ feature ϒϥϯνͰɺػೳ௥Ճͷ࡞ۀʹ໭Γ·͢
25. 25 master fix 
 feature ϒϥϯν͕͋Δͱ ػೳ௥Ճ͕׬ྃͨ͠Βɺmaster ʹ౷߹͠ɺ ެ։͠·͢ɻ
26. 26 ✱ Ϛʔδ: ϒϥϯνؒͷσʔλΛ౷߹͢Δ͜ͱ ✱ ࠩ෼͸ɺجຊతʹࣗಈͰ൓ө͞ΕΔ (ߦ୯Ґ) Ϛʔδͱ͸ master fix 
 feature 26
27. 27 ϒϥϯνར༻Πϝʔδ 1. ৽ϝχϡʔͷ௥Ճ࡞ۀΛ͠·͢ 2. ࡞ۀ్தʹɺۓٸͷՁ֨मਖ਼͕ൃੜʂ 3. ͬ͘͞ͱۓٸରԠͨ͠ͷͪ 4. ৽ϝχϡʔͷ௥Ճ࡞ۀʹ໭Γ·͢ ΍ͬͯΈΑ͏
28. 28 1. ৽ϝχϡʔ༻ͷϒϥϯνΛ࡞Δ 2. <tr> Λ௥Ճɺ৽ϝχϡʔΛૠೖɺ
 ͨͱ͑͹Ձ֨ະఆͱͯ͠ίϛοτ 3. master ͔Βۓٸमਖ਼༻ϒϥϯνΛ࡞Δ 4. ۓٸमਖ਼ͯ͠ίϛοτ 5. master ʹϚʔδ 6. ৽ϝχϡʔ༻ϒϥϯνʹ໭ͬͯɺ࡞ۀܧଓ ΍ͬͯΈΑ͏
29. 29 master 
 fix-typo add-menu ϒϥϯν͓͞Β͍ ࡞ۀ͝ͱʹϒϥϯν࡞੒ → ׬੒ͨ͠ΒmasterʹϚʔδ ଞͷमਖ਼ͱͬͪ͝ΌʹͳΒͣɺεϜʔζʹ࡞ۀͰ͖Δ
30. 30 ✱ αϧͰ΋Θ͔ΔGitೖ໳
 Git ΛΘ͔Γ΍͘͢ਤղ (ψʔϥϘ͞Μ࡞੒)
 http://www.backlog.jp/git-guide/ ✱ Git-it
 ίϚϯυϥΠϯ(ࠇ͍ը໘)Ͱ
 Git Λ֮͑ΔͨΊͷڭࡐ (GitHubͷਓ࡞੒)
 https://github.com/jlord/git-it ΋ͬͱษڧ͍ͨ͠ͳΒ
31. 31 ✱ ͋Γ͕ͱ͏͍͟͝·ͨ͠ ✱ Ҿ͖ଓ͖ TAM / λϯόϦϯ͸ϒʔεΛ
 ग़͍ͯ͠·͢ɺͥͻཱ͓ͪدΓ͍ͩ͘͞ ✱ ٻਓ͸ Wantedly TAM or
 Wantedly λϯόϦϯ Ͱݕࡧ ͓ΘΓ