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

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

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

kazakago

July 12, 2017
Tweet

More Decks by kazakago

Other Decks in Programming

Transcript

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

    View full-size slide

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

    View full-size slide

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

    View full-size slide

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

    View full-size slide

  5. ग़དྷͯͳ͍ͳʔͱࢥ͏ͳΒ

    ʮGit-FlowʯΛ࢖͓͏ʂ

    View full-size slide

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

    View full-size slide

  7. Git-Flow Step

    View full-size slide

  8. Git Flow Command
    • ॳظԽ
    • $ git flow init
    • featureϒϥϯν࡞੒
    • $ git flow feature start MYFEATURE
    • featureϒϥϯνऴྃʢϚʔδʣ
    • $ git flow feature finish MYFEATURE

    View full-size slide

  9. How to Install Git-Flow Command
    • Mac
    • $ brew install git-flow-avh
    • Linux (Debian)
    • $ apt-get install git-flow
    • Windows
    • $ ஌ΒΜ

    View full-size slide

  10. Git-Flow on SourceTree

    View full-size slide

  11. Git-Flow on SourceTree (2)

    View full-size slide

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

    View full-size slide

  13. GitHub-Flow
    • GitHub-Flowͱ͍͏Git-Flow؆ུԽͨ͠ͷ΋ͷ΋͋Δ
    • Git-Flow͔ΒDevelopΛऔΓআ͍ͨΑ͏ͳ΋ͷʢৗʹmasterʹϚʔ
    δʣ
    • masterϒϥϯνͷ಺༰͸͙͢͞·ϦϦʔε͢Δ
    • GitHub͸WebαʔϏεͰ͋ΓɺҰ೔ʹԿ౓΋ϦϦʔε͢ΔͨΊGit-
    FlowͰ͸ϦϦʔε·Ͱͷεςοϓ͕ଟ͕͔͔͗ͯ࣌ؒ͢Γ͗͢Δ
    • ϞόΠϧΞϓϦ։ൃͰ͸ٯʹϦϦʔεࣗମͷίετ͕ߴ͘ɺҰ೔ʹ
    Կ౓΋ϦϦʔε͢Δ͜ͱ͸গͳ͍ͨΊෆ޲͖ɻ

    View full-size slide

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

    View full-size slide

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

    View full-size slide