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

GitLab Flow

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
ogom
July 26, 2014

GitLab Flow

GitLab with Flow

ogom

July 26, 2014

Transcript

28 slides
  1. git-flow ෳ਺ͷϒϥϯνʹ໨తͱϧʔϧΛ࣋ͨͤͯӡ༻ Branches આ໌ master ϦϦʔεͰ͖Δঢ়ଶɻϦϦʔεʹλάΛ͚ͭΔɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ develop ։ൃ࡞ۀͷத৺ɻfeature΍releaseʹϚʔδ͢Δɻ feature ػೳ௥Ճͷ࡞ۀɻdevelop͔Β෼ذͯ͠developʹϚʔδ͢Δɻ

    release ϦϦʔεͷ४උ࡞ۀɻdevelop͔Β෼ذͯ͠masterͱdevelopʹϚʔδ͢Δɻ hotfix ϦϦʔεޙͷۓٸ࡞ۀɻmaster͔Β෼ذͯ͠masterͱdevelopʹϚʔδ͢Δɻ & git-flow Cheat Sheet (೔ຊޠ) 13/28
  2. GitHub Flow ̍ͭͷϒϥϯν(master)ΛϦϦʔεͰ͖Δঢ়ଶʹҡ࣋ͯ͠ӡ༻ Works આ໌ Create a branch master͔Β෼ذͯ͠ɺϒϥϯνΛ࡞੒͢Δɻ Add

    commits ։ൃ࡞ۀͷத৺ɻมߋͷίϛοτΛ௥Ճ͢Δɻ Open a Pull Request masterʹϓϧϦΫΤετΛૹ৴͢Δɻ Discuss and Review มߋͷ಺༰Λٞ࿦ͯ͠ɺίʔυͷϨϏϡʔΛ͢Δɻ Merge and Deploy masterʹϚʔδͯ͠ɻϦϦʔε͢Δɻ & Understanding the GitHub Flow 14/28
  3. GitLab Flow masterϒϥϯνͱstableϒϥϯνΛฏߦͰ։ൃ͢Δӡ༻ Branches આ໌ master ։ൃ࡞ۀͷத৺ɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ feature ػೳ௥Ճͷ࡞ۀɻmaster͔Β෼ذͯ͠masterʹϚʔδ͢Δɻ stable

    ϦϦʔεͰ͖Δঢ়ଶɻϦϦʔεʹλάΛ͚ͭΔɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ hotfix ϦϦʔεޙͷۓٸ࡞ۀɻstable͔Β෼ذͯ͠stableͱmasterʹϚʔδ͢Δɻ & git-flow͔ΒdevelopϒϥϯνΛআ͍ͯGitHub Flowͱෳ߹ & masterɺfeature ͱstableɺhotfix ʹGitHub FlowΛదԠ 15/28

More Decks by ogom

Other Decks in Programming