git enhancement

#1 git-flow

Transcript

1. git enhancement #1 git-flow 1 12೥8݄6೔݄༵೔
2. Git ࢖ͬͯ·͔͢ʁ • தԝϦϙδτϦ͕ͳͯ͘΋ར༻Ͱ͖Δ • ϩʔΧϧͰϒϥϯν΍λάΛࣗ༝ʹ࡞੒Ͱ͖Δ • ෳ਺ͷϦϞʔτϦϙδτϦͱࣗ༝ʹ࿈ܞͰ͖Δ • Pull Request (GitLab Ͱ͸ Merge Request) ศར • ͳͲͳͲػೳ͕੝Γͩ͘͞Μʂ 2 12೥8݄6೔݄༵೔
3. ݁ߏͳΜͰ΋Ͱ͖Δ 3 12೥8݄6೔݄༵೔
4. Α͋͘Δޫܠ 4 12೥8݄6೔݄༵೔
5. ͓Ε Push ͨ͠Α Α͋͘Δޫܠ 4 12೥8݄6೔݄༵೔
6. ͓Ε Push ͨ͠Α ͜ͷ Branch ͳʹʁ Α͋͘Δޫܠ 4 12೥8݄6೔݄༵೔
7. ͓Ε Push ͨ͠Α ͜ͷ Branch ͳʹʁ ࠷৽ͲΕΑʁ Α͋͘Δޫܠ 4 12೥8݄6೔݄༵೔
8. ͓Ε Push ͨ͠Α ͜ͷ Branch ͳʹʁ ࠷৽ͲΕΑʁ ͜ͷόάमਖ਼͸Ͳͷ Branch ʹద༻ͨ͠ͷʁ Α͋͘Δޫܠ 4 12೥8݄6೔݄༵೔
9. ͭ·Γ… 5 12೥8݄6೔݄༵೔
10. ͭ·Γ… ΧΦεͳঢ়گʹ΋ ͳΓ΍͍͢ʂ 5 12೥8݄6೔݄༵೔
11. ࠓ೔ͷຊ୊ 6 12೥8݄6೔݄༵೔
12. ࠓ೔ͷຊ୊ git-flow ͕͍͢͝ 6 12೥8݄6೔݄༵೔
13. What’s git-flow? 7 12೥8݄6೔݄༵೔
14. What’s git-flow? • ෼ࢄ͕ͪ͠ͳϒϥϯνΛ؅ཧ 7 12೥8݄6೔݄༵೔
15. What’s git-flow? • ෼ࢄ͕ͪ͠ͳϒϥϯνΛ؅ཧ • νʔϜ಺ͰϒϥϯνϞσϧΛڞ༗ 7 12೥8݄6೔݄༵೔
16. What’s git-flow? • ෼ࢄ͕ͪ͠ͳϒϥϯνΛ؅ཧ • νʔϜ಺ͰϒϥϯνϞσϧΛڞ༗ • Git ͷ௕ॴΛଛͳΘͣʹ Subversion ͷΑ͏ͳूத؅ ཧ΋΍ͬͪΌ͏ʂ 7 12೥8݄6೔݄༵೔
17. What’s git-flow? • ෼ࢄ͕ͪ͠ͳϒϥϯνΛ؅ཧ • νʔϜ಺ͰϒϥϯνϞσϧΛڞ༗ • Git ͷ௕ॴΛଛͳΘͣʹ Subversion ͷΑ͏ͳूத؅ ཧ΋΍ͬͪΌ͏ʂ • Ͱ΋ͨͩ git ίϚϯυΛϥοϓͯ͠Δ͚ͩ 7 12೥8݄6೔݄༵೔
18. installation of git-flow • Mac OSX • brew install git-flow • port install git-flow • Ubuntu • aptitude install git-flow • Windows • खॱ͕໘౗ͳͷͰׂѪ— 8 12೥8݄6೔݄༵೔
19. git-flow branches Branch Name Description master ϦϦʔε༻ϒϥϯν develop ։ൃ༻ϒϥϯν feature/{feature name} ػೳ։ൃ༻Ұ࣌ϒϥϯν release/{release name} ϦϦʔε༻Ұ࣌ϒϥϯν hotfix/{hotfix name} όάमਖ਼༻Ұ࣌ϒϥϯν support/{support name} αϙʔτ༻Ұ࣌ϒϥϯν {version} λά 9 12೥8݄6೔݄༵೔
20. “master” and “develop” • “master” • ݱࡏϦϦʔε͞Ε͍ͯΔΞϓϦέʔγϣϯͱಉ౳ • “develop” • ։ൃ൛ͷ࠷৽ • ೔ʑػೳ͕௥Ճ͞Ε͍ͯ͘ײ͡ • ྫ͑͹։ൃ؀ڥͰಈ࡞͍ͯ͠ΔΞϓϦέʔγϣϯ͕ ૬౰͢Δ 10 12೥8݄6೔݄༵೔
21. “feature” • “develop” Λݩʹ࡞੒͞ΕΔϒϥϯν • ಛఆͷػೳ։ൃணख࣌ʹ࡞੒ • ػೳ։ൃ͕ऴྃ͢Δͱ͖ʹ “develop” ʹϚʔδ • Ϛʔδͱͱ΋ʹ “feature” ϒϥϯν͸ഁغ 11 12೥8݄6೔݄༵೔
22. “hotfix” • “master” Λݩʹ࡞੒͞ΕΔϒϥϯν • ՔಇதͷΞϓϦέʔγϣϯͰݟ͔ͭͬͨόάΛमਖ਼͢Δ ͨΊͷϒϥϯν • όάमਖ਼ணख࣌ʹ࡞੒ • όάमਖ਼͕ऴྃ͢Δͱ͖ʹ “master” ͱ “develop” ʹϚʔδ • Ϛʔδͱͱ΋ʹ “hotfix” ϒϥϯν͸ഁغ 12 12೥8݄6೔݄༵೔
23. “release” • “develop” Λݩʹ࡞੒͞ΕΔϒϥϯν • ։ൃதͷ҆ఆ൛ΛϦϦʔε͢Δͱ͖ʹ࡞੒ • README ΍ϦϦʔεϊʔτΛهड़ • ϦϦʔελΠϛϯάͰ “master” ͱ “develop” ʹϚʔδ • Ϛʔδͱͱ΋ʹ “release” ϒϥϯν͸ഁغ 13 12೥8݄6೔݄༵೔
24. git-flow hands-on 14 12೥8݄6೔݄༵೔
25. git-flow hands-on ͕࣌ؒ͋Ε ͹ϥΠϒͰ΍ ͬͯΈ·͢ 14 12೥8݄6೔݄༵೔
26. ؆୯ͳ·ͱΊ 15 12೥8݄6೔݄༵೔
27. ػೳ։ൃ͢Δ • git flow feature start 1122_retrieve_gn • ͝ʹΐ͝ʹΐ։ൃ…ςετ΋๨Εͣʹ… • git flow feature finish 1122_retrieve_gn • “develop” ʹػೳ͕औΓࠐ·ΕΔ 16 12೥8݄6೔݄༵೔
28. όάΛमਖ਼͢Δ • git flow hotfix start 1234_nullpo • ͝ʹΐ͝ʹΐमਖ਼͢Δ…౰વςετ΋ʂ • git flow hotfix finish 1234_nullpo • “master” ͱ “develop” ʹऔΓࠐ·ΕΔ 17 12೥8݄6೔݄༵೔
29. όάΛमਖ਼͢Δ • git flow hotfix start 1234_nullpo • ͝ʹΐ͝ʹΐमਖ਼͢Δ…౰વςετ΋ʂ • git flow hotfix finish 1234_nullpo • “master” ͱ “develop” ʹऔΓࠐ·ΕΔ ࣗಈతʹ λά෇͚΋ 17 12೥8݄6೔݄༵೔
30. ϦϦʔε͢Δ • git flow release start 1.2.1 • ϦϦʔεϊʔτΛॻ͜͏ʂ • ͜Μͳػೳ͕௥Ճ͞Εͨ • ͜Μͳόά͕मਖ਼͞Εͨ • git flow release finish 1.2.1 • “master” ͱ “develop” ʹऔΓࠐ·ΕΔ 18 12೥8݄6೔݄༵೔
31. ϦϦʔε͢Δ • git flow release start 1.2.1 • ϦϦʔεϊʔτΛॻ͜͏ʂ • ͜Μͳػೳ͕௥Ճ͞Εͨ • ͜Μͳόά͕मਖ਼͞Εͨ • git flow release finish 1.2.1 • “master” ͱ “develop” ʹऔΓࠐ·ΕΔ ࣗಈతʹ λά෇͚΋ 18 12೥8݄6೔݄༵೔
32. refs • nvie/gitflow • https://github.com/nvie/gitflow/ • A successful Git branching model • http://nvie.com/posts/a-successful-git-branching-model/ • git-flow ʹΑΔϒϥϯνͷ؅ཧ • http://www.oreilly.co.jp/community/blog/2011/11/branch- model-with-git-flow.html 19 12೥8݄6೔݄༵೔
33. ·ͩ·ͩ࢖͍͜ͳͤͯͳ͍ͷͰ͕͢ git-flow ʹΑͬͯιʔε؅ཧ͕Θ͔Γ΍͘͢ͳΔ ͱײ͍ͯ͡·͢ 20 12೥8݄6೔݄༵೔
34. ·ͩ·ͩ࢖͍͜ͳͤͯͳ͍ͷͰ͕͢ git-flow ʹΑͬͯιʔε؅ཧ͕Θ͔Γ΍͘͢ͳΔ ͱײ͍ͯ͡·͢ ΋͏Ͷ 20 12೥8݄6೔݄༵೔
35. ͓ΘΓ 21 12೥8݄6೔݄༵೔