チームで使おうGit&GitHub

6月3日(土) Git講座

Transcript

1. νʔϜͰ࢖͓͏
   Git&GitHub
2. Git GitHub ෼ࢄܕόʔδϣϯ؅ཧπʔϧ (JUΛϗεςΟϯά͢ΔαʔϏε
3. ίϚϯυҰཡ JOJU BEE DPNNJU SFNPUF QVTI QVMM DIFDLPVU CSBODI TUBTI SFTFU DMPOF MPH GFUDI SFCBTF TUBUVT EJ⒎
4. ίϚϯυҰཡ BEE DPNNJU JOJU SFNPUF QVTI QVMM DMPOF GFUDI DIFDLPVU CSBODI SFCBTF TUBTI SFTFU MPH TUBUVT EJ⒎ ঢ়ଶ؅ཧ νʔϜ ϦϞʔτ ϩʔΧϧ
5. init add HJUΛॳظԽ͢ΔίϚϯυ
   HJUΛ࢖͏ͨΊͷ͓·͡ͳ͍ ͠ͷ͖༁ ಛఆͷϑΝΠϧΛεςʔδϯάΤϦΞʹ௥Ճ͢ΔίϚϯυ
   DPNNJU͢ΔϑΝΠϧͷબ୒Λͯ͠Δ ͠ͷ͖༁
6. commit push HJUϑΥϧμʹมߋ఺ɾࠩ෼Λ௥Ճ͢ΔίϚϯυ
   HJUʹηʔϒ͢Δڧྗͳηʔϒ ͠ͷ͖༁ ϗεςΟϯάઌʹϩʔΧϧͷมߋ఺Λ൓ө͢ΔίϚϯυ
   HJUIVCͷϓϩδΣΫτΛߋ৽͢Δ ͠ͷ͖༁
7. pull clone ϦϞʔτͷมߋ఺ΛϩʔΧϧʹϚʔδ͢ΔίϚϯυ
   HJUIVCΛϩʔΧϧʹڧ੍తʹ൓ө ͠ͷ͖༁ ϦϞʔτͷίϐʔΛϩʔΧϧʹͭ͘ΔίϚϯυ
   ਖ਼͘͠HJUIVCΛϩʔΧϧʹμ΢ϯϩʔυ ͠ͷ͖༁
8. remote branch ϦϞʔτͷϦϙδτϦͱϩʔΧϧΛ઀ଓ͢ΔίϚϯυ
   ϦϞʔτͷ63-Λอଘ ͠ͷ͖༁ ϒϥϯνΛ࡞੒ɾ࡟আͳͲϒϥϯνͷૢ࡞Λ͢ΔίϚϯυ
   ϒϥϯνΛ࡞੒͢ΔແҙຯͳίϚϯυ ͠ͷ͖༁
9. checkout status ϒϥϯνΛ੾Γସ͑ΔίϚϯυ
   DIFDLPVU
   C
   ৽͍͠ϒϥϯν໊͕ศར ͠ͷ͖༁ HJUͷঢ়ଶΛݟΔͨΊͷίϚϯυ
   ࠩ෼͕͋Δ͔֬ೝ͢Δ ͠ͷ͖༁
10. stash ݱঢ়ͷมߋ఺ΛҰ࣌ୀආ͢ΔίϚϯυ
    QVMM͢Δͱ͖ʹࠩ෼͕͋ͬͨΒTUBTI ͠ͷ͖༁
11. νʔϜ։ൃͷྲྀΕ
12. νʔϜ։ൃͷྲྀΕ  ϒϥϯνΛ੾Δ
     ίϛοτϓογϡ
     ϓϧϦΫग़͢
     (JU)VC্ͰϨϏϡʔϚʔδ
     NBTUFSΛQVMM
13. master origin/master branchA branchB push branch commit commit merge push&pull request push&pull request merge pull pull
14. master origin/master branchA branchB push branch push&pull request merge pull commit commit push&pull request pull conflict merge
15. master origin/master branchA branchB push branch push&pullreq pull commit commit merge pull pull merge push&pullreq
16. νʔϜ։ൃͷݪଇ w NBTUFSʹίϛοτ͠ͳ͍
    w NBTUFS͸ϓϧͷΈ
    w Ϛʔδ͸(JU)VC্Ͱ
17. νʔϜ։ൃͷͨΊʹ
18. νʔϜ։ൃͷͨΊʹ w HJUJHOPSFΛͭ͘Δ
    w EJ⒎ΛݟΔ
19. νʔϜJ04։ൃͷͨΊʹ w QSPKFDUQCYQSPKʹ஫ҙ
    w *OUFSGBDF
    #VJMEFS͸ۃྗ৮Βͳ͍