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

Git&GitHubで共同作業〜入門編

Yoko TAMADA
September 24, 2012

 Git&GitHubで共同作業〜入門編

FuelPHP 勉強会 東京 Vol.2 http://atnd.org/events/31017

Yoko TAMADA

September 24, 2012
Tweet

More Decks by Yoko TAMADA

Other Decks in Technology

Transcript

  1. (JU(JU)VCͰڞಉ࡞ۀ
    ʙೖ໳ฤʙ
    2012.9.23 Sat. #FuelPHPTokyo vol.2
    Yoko TAMADA @tmd45

    View Slide

  2. ࣗݾ঺հ
    ̼̳̓̐̑ʢͨ·˔ʣ
    ීஈ͸+BWBͰ͓࢓ࣄ
    8FCܥγεςϜ ༧໿αΠτ
    ͍ΜͨʔͶͬͱେ޷͖
    1)1ྺ͸̍೥ͪΐͬͱ
    (JU͸ओʹݸਓར༻ͷΈ

    View Slide

  3. ΞδΣϯμ
    όʔδϣϯ؅ཧγεςϜ
    தԝूதܕʁ෼ࢄܕʁ
    ͳΜͰ(JUʁ
    (JUͱ(JU)VC
    (JU)VCͬͯʁ
    ˞͕࣌ؒ͋ͬͨΒ࣮ԋ͠·͢ɻ

    View Slide

  4. όʔδϣϯ؅ཧγεςϜ

    View Slide

  5. มߋཤྺΛ؅ཧ͢ΔγεςϜ
    ιʔείʔυΛॻ͖଍ͨ͠Γɺมߋͨ͠Γ͢
    ΔաఔΛه࿥
    ಛఆͷஈ֊·Ͱ໭Δ
    ޡͬͯফͯ͠͠·ͬͨϑΝΠϧΛ෮׆
    ڞಉ࡞ۀͰͷϚʔδɺ࠷৽ιʔεͷೖख
    όʔδϣϯ؅ཧγεςϜ
    Version Control System

    View Slide

  6. όʔδϣϯ؅ཧγεςϜ
    Version Control System
    CVS
    Subversion
    VSS
    ClearCase
    தԝूதܕ ෼ࢄܕ
    GIT
    Mercurial
    Bazaar
    SVK

    View Slide

  7. όʔδϣϯ؅ཧγεςϜ
    Version Control System
    தԝूதܕ




















    ϦϙδτϦ

    View Slide

  8. όʔδϣϯ؅ཧγεςϜ
    Version Control System
    ෼ࢄܕ




















    ϦϞʔτ
    ϦϙδτϦ
    ϩʔΧϧ
    ϦϙδτϦ

    View Slide

  9. αʔό͕
    μ΢ϯͯ͠΋
    ؅ཧ৘ใ͕࢒Δ
    όʔδϣϯ؅ཧγεςϜ
    Version Control System
    ෼ࢄܕ





    αʔόʹ
    ΞΫηεෆཁ
    ϩʔΧϧ
    ϦϙδτϦ
    ؅ཧ͸
    ʢूதܕΑΓʣ
    ෳࡶʹͳΔ

    View Slide

  10. ͳΜͰ(JUʁ
    -JOVYΧʔωϧ؅ཧͷͨΊʹ࡞ΒΕͨ
    طଘͷόʔδϣϯ؅ཧͰ͸ຬ଍Ͱ͖ͳ͔ͬͨ
    ػೳ΍ੑೳΛ֬อ͢ΔͨΊʹɺɹɹɹɹ
    -JOVT5PSWBMETࢯʹΑͬͯ࡞ΒΕͨ
    ެ։౰ॳ͸ϋοΧʔʹ͔͠࢖͑ͳ͍͘Β͍ߥ
    ࡟Γͳ΋ͷ͕ͩͬͨɺଟ͘ͷ։ൃऀͷڠྗʹ
    ΑͬͯੈքதͷϓϩάϥϚʹར༻͞ΕΔΑ͏
    ʹͳͬͨ
    ਓؾ͋ΔΑͶʂϊ΢ϋ΢͕ಘ΍͍͢

    View Slide

  11. (JUͱ(JU)VC

    View Slide

  12. (JU)VCͬͯʁ
    https:/
    /github.com

    View Slide

  13. (JU)VCͬͯʁ
    (JUͱ(JU)VC͸ผ෺
    (JUIVC͸ɺ(JUϦϙδτ
    ϦͷϗεςΟϯάαʔϏε
    ଞͷϗεςΟϯάαʔϏε
    #JUCVDLFU
    "TTFNCMB
    ,JMOͳͲ

    View Slide

  14. (JU)VCͬͯʁ
    ιʔγϟϧίʔσΟϯά
    ϗεςΟϯά͚ͩ͡Όͳ͍
    Ұ෦ͷίϛολͱݺ͹ΕΔಛݖ
    ֊ڃ͕ओݖΛѲ͍ͬͯͨ։ൃ͔
    ΒɺΦʔϓϯͰʮຽओԽʯ͞Ε
    ͨεϐʔυײ͋Δ։ൃ͕Մೳ
    ʹͳͬͨ
    ݸਓ͕ίʔυΛॴ༗͢Δݖར

    View Slide
















  15. Git
    Git Git
    Git Git
    GitHub
    local
    Fork
    Pull Request
    pull
    push
    pull
    push
    pull
    merge
    add
    commit

    View Slide

  16. ࣌ؒ͋ΔʁͰ͸ɺ࣮ԋΛ

    View Slide

  17. View Slide

  18. View Slide

  19. ࢀߟ৘ใ

    View Slide

  20. http:/
    /www.backlog.jp/git-guide/
    αϧͰ΋Θ͔Δ(JUೖ໳
    ʙόʔδϣϯ؅ཧΛ࢖͍͜ͳͦ͏

    View Slide

  21. 8%#13&447PM
    ಛू̍
    ৄղ(JUIVC
    ʙ͸͡ΊΑ͏ʂιʔγϟϧίʔσΟϯά
    1VMM3FRVFTU͕৫Γͳ͢
    ޮ཰తιϑτ΢ΣΞ։ൃʙ

    View Slide

  22. ͝ࢹௌ͋Γ͕ͱ͏
    ͍͟͝·ͨ͠ɻ

    View Slide