Upgrade to Pro — share decks privately, control downloads, hide ads and more …

モバイルアプリ開発におけるブランチ運用でこの先生きのこるには

 モバイルアプリ開発におけるブランチ運用でこの先生きのこるには

16d3962b8f11b7e801dacb129d20d8dd?s=128

KazaKago

July 12, 2017
Tweet

More Decks by KazaKago

Other Decks in Programming

Transcript

  1. ϞόΠϧΞϓϦ։ൃʹ͓͚Δ ϒϥϯνӡ༻Ͱ ͜ͷઌੜ͖ͷ͜Δʹ͸ 2017/07/12

  2. Self-Introduction • ాଜ ݠհʢ@KazaKagoʣ • גࣜձࣾΠάχεॴଐ • ࿀Ѫࠗ׆ΞϓϦʮwithʯ։ൃϝϯόʔ • Android։ൃྺ͸7೥͘Β͍

  3. ͦ͜ͷΩϛ

  4. ϒϥϯνӡ༻ɺ ͪΌΜͱग़དྷͯ·͔͢ʁ

  5. ग़དྷͯΔͳΒ Կ΋ݴ͏͜ͱ͸ͳ͍Ͱ͢

  6. ग़དྷͯͳ͍ͳʔͱࢥ͏ͳΒ
 ʮGit-FlowʯΛ࢖͓͏ʂ

  7. What’s Git-Flow? • master • develop • feature/* • feature/edit_profile

    • release/* • release/2.3.0 • hotfix/* • hotfix/2.3.1 …ϦϦʔε෺͕ฒͿϒϥϯν …ػೳ։ൃͷ۠੾Γͱͳ͍ͬͯΔϒϥϯν …ҰਓͻͱΓ͕։ൃ࡞ۀ͢ΔͨΊͷϒϥϯν • ։ൃ͢Δػೳ໊Λ͚ͭΔ …ϦϦʔε४උͷͨΊͷϒϥϯν • ϦϦʔε͢Δόʔδϣϯ໊Λ͚ͭΔ …ۓٸରԠͷͨΊͷϒϥϯν • ϦϦʔε͢Δόʔδϣϯ໊Λ͚ͭΔ
  8. Git-Flow Step

  9. Git Flow Command • ॳظԽ • $ git flow init

    • featureϒϥϯν࡞੒ • $ git flow feature start MYFEATURE • featureϒϥϯνऴྃʢϚʔδʣ • $ git flow feature finish MYFEATURE
  10. How to Install Git-Flow Command • Mac • $ brew

    install git-flow-avh • Linux (Debian) • $ apt-get install git-flow • Windows • $ ஌ΒΜ
  11. Git-Flow on SourceTree

  12. Git-Flow on SourceTree (2)

  13. Tips • Github౳ͷPullRequestϕʔεͰ։ൃ͍ͯ͠Δ৔߹ɺPullRequestը ໘্ͷϚʔδϘλϯ͸ԡͣ͞ɺGit-FlowίϚϯυ্Ͱૢ࡞͢΂͠ • releaseϒϥϯν΍hotfixϒϥϯνͰ͸developͱmaster΁ಉ࣌ʹϚʔ δͭͭ͠λάΛ෇͚Δඞཁ͕͋ΓɺGit-FlowίϚϯυ͔Βૢ࡞͢Δ ͱͦΕΒΛҰׅͰ΍ͬͯ͘ΕΔ • PRͷϚʔδϘλϯΛԡ͢ͱࢦఆͨ͠Ұͭͷϒϥϯνʹ͔͠Ϛʔδ͞

    Εͣλά෇͚࿙Ε౳ͷڪΕ͕͋ΔͨΊ͓͢͢Ί͠ͳ͍
  14. GitHub-Flow • GitHub-Flowͱ͍͏Git-Flow؆ུԽͨ͠ͷ΋ͷ΋͋Δ • Git-Flow͔ΒDevelopΛऔΓআ͍ͨΑ͏ͳ΋ͷʢৗʹmasterʹϚʔ δʣ • masterϒϥϯνͷ಺༰͸͙͢͞·ϦϦʔε͢Δ • GitHub͸WebαʔϏεͰ͋ΓɺҰ೔ʹԿ౓΋ϦϦʔε͢ΔͨΊGit-

    FlowͰ͸ϦϦʔε·Ͱͷεςοϓ͕ଟ͕͔͔͗ͯ࣌ؒ͢Γ͗͢Δ • ϞόΠϧΞϓϦ։ൃͰ͸ٯʹϦϦʔεࣗମͷίετ͕ߴ͘ɺҰ೔ʹ Կ౓΋ϦϦʔε͢Δ͜ͱ͸গͳ͍ͨΊෆ޲͖ɻ
  15. ݁࿦

  16. Git-FlowΛ࢖͑͹ ϒϥϯνӡ༻͸ා͘ͳ͍

  17. ͋Γ͕ͱ͏ ͍͟͝·ͨ͠