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

Developing with Git and Pull Request / Git x Pu...

Developing with Git and Pull Request / Git x Pull Request でチーム開発

PHPカンファレンス2012 発表資料 / PHP Conference Tokyo 2012

Sotaro Karasawa

September 15, 2012
Tweet

More Decks by Sotaro Karasawa

Other Decks in Programming

Transcript

  1. Git

  2. Git ϒϥϯνઓུͷ ϕετϓϥΫςΟεͷͻͱͭ A Successful Git Branching Model http://nvie.com/posts/a-successful-git-branching- model/

    ೔ຊޠ༁ http://keijinsonyaban.blogspot.jp/2010/10/ successful-git-branching-model.html
  3. Pull Request Λఏڙ͢ΔγεςϜ ɾGitHub (༗ྉͰprivateϦϙδτϦ) ඇਪ঑ɻprivate ϦϙδτϦɺEnterprise ΑΓ͍҆ ͚Ͳ ...

    མͪͯΔͱϦϦʔεͰ͖ͳ͍ΑͶ ɾGitHub Enterprise ͓͕ۚ͋ΔͳΒΦεεϝɻ ɾGitLab ແྉɻϝϯς͸େมɻMerge Requestɻଟগόάͬ ͯ΋ෆຬΛݴΘͳ͍ খن໛ͳνʔϜͳΒΦεεϝɻ
  4. Pull Request Λఏڙ͢ΔγεςϜ GHE GitLab Ձ֨ $21/user/݄ ແྉ ϝϯςφϯείετ ௿͍

    (ແ Ͱ͸ͳ͍) ߴ͍ Repository Viewer ˕ ˕ Network Chart ˕ ˕ User Namespace / Fork ˕ × Pull Request ˕ ˕ Auto Merge (Web͔Β) ˕ ˕
  5. Pull Request Λఏڙ͢ΔγεςϜ GHE GitLab Ձ֨ $21/user/݄ ແྉ ϝϯςφϯείετ ௿͍

    (ແ Ͱ͸ͳ͍) ߴ͍ Repository Viewer ˕ ˕ Network Chart ˕ ˕ User Namespace / Fork ˕ × Pull Request ˕ ˕ Auto Merge (Web͔Β) ˕ ˕ EJGGϏϡʔ มߋϑΝΠϧϦετɾEJGGϏϡʔ ίϝϯτ ߦίϝϯτ 8FCΠϯλʔϑΣΠε͔ΒͷࣗಈϚʔδ ϚʔδޙࣗಈΫϩʔζ
  6. GitLab ಋೖ & Pull Request ඞਢʹ ɾجຊతʹ feature ϒϥϯνΛͭ͘Δ ʢ͜Ε͸ͦΕҎલ͔ΒͰ͖͍ͯͨʣ

    ɾ2ਓ1૊ (1ਓͱϦʔμʔͱܾΊΔ) ͰνʔϜΛ࡞Γɺඞ ͣνʔϜ಺ϨϏϡʔΛ͢Δ ɾϦʔμʔಉ࢜͸ޓ͍ʹϨϏϡʔ