Gitの思想を理解する

Transcript

1. Gitͷࢥ૝Λཧղ͢Δ 2018/02/01 ࣾ಺ษڧձ kondo takeshi
2. ͓͠ͳ͕͖ • ࣗݾ঺հ • ൃදͷΰʔϧ • VCS(Version Control System)ͷ࿩ • Gitͷ࿩ • GitΛ࢖ͬͨιʔγϟϧίʔσΟϯάͷ࿩
3. ࣗݾ঺հ • kondo takeshi • https://qiita.com/tk117
4. ࢲͱGit • 2014 … ೖࣾʙݚम • 2015 … ϓϥΠϕʔτΫϥ΢υ؅ཧ੡඼։ൃɾอक • 2016લ…ϓϥΠϕʔτΫϥ΢υ։ൃɾอक • 2016ޙ…ϓϥΠϕʔτΫϥ΢υ։ൃ CI/CDಋೖ • 2017 … RDBMSͷupgrade ݚमͰDPOqJDU஍ࠈɺ(JUۤखҙࣝ 47/͕ͩ͋·Γ֮͑ͯͳ͍ ࣗ෼Ͱ(JUMBCΛཱͯͯͳΜͰ΋(JUʹอଘ͢ΔΑ͏ʹ ΊͬͪΌ(JU࢖ͬͨɻਐḿใࠂ΋(JU
5. ࡢ೔هࣄॻ͍ͨ • ࠓ೔ͪΐ͍ͪΐ͍ग़·͢
6. ൃදͷΰʔϧ • Git৴ऀʹͳΔ͜ͱ • Gitͷࢥ૝Λཧղ͢Δ͜ͱ • ͳΜͷͨΊʹGitΛ࢖͏͔ཧղ͢Δ͜ͱ • ԿΛGitͰ͢΂͖Ͱͳ͍͔ཧղ͢Δ͜ͱ
7. VCS(Version Control System) ͷ࿩ • ࣗݾ঺հ • ൃදͷΰʔϧ • VCS(Version Control System)ͷ࿩ • ͳͥVCSΛ࢖͏ͷ͔ • VCSͷྺ࢙ • GitͱSubversionͷൺֱ • commitͷཻ౓Λߟ͑Δ • VCSΛ࢖͏্Ͱ৺͕͚Δ͜ͱ • Gitͷ࿩ • GitΛ࢖ͬͨιʔγϟϧίʔσΟϯάͷ࿩
8. ͳͥVCSΛ࢖͏ͷ͔ • Qiita΁Ͳ͏ͧ
9. VCSͷมભ
10. GitͱSubversionͷҧ͍ • ूதܕ͔෼ࢄܕ͔͸େͨ͠໰୊Ͱ͸ͳ͍ • ࢥ૝͕ҧ͏ • http://local.joelonsoftware.com/wiki/෼ࢄόʔδϣϯ؅ཧͰؒҧ͍ͳ͍ͬͯɺϕΠϏʔ
11. Commitͷཻ౓Λߟ͑Δ • Qiita΁Ͳ͏ͧ
12. VCSΛ࢖͏্ͰؾΛ͚ͭΔ͜ͱ • GitͷϚΠϯυηοτΛ࣋ͭ͜ͱ • νΣϯδηοτ(มߋ)ͷੵΈॏͶͰ͋Δ • ͢΂ͯ͸νΣϯδηοτͰ͋Δ • զʑͷؔ৺͸νΣϯδηοτʹ͋Δ
13. Gitͷ࿩ • ࣗݾ঺հ • ൃදͷΰʔϧ • VCS(Version Control System)ͷ࿩ • Gitͷ࿩ • Gitͷ಺෦ߏ଄ • Gitૉ๿ͳٙ໰ • Gitॳ৺ऀΞϯνύλʔϯ • GitΛ࢖ͬͨιʔγϟϧίʔσΟϯάͷ࿩
14. Gitͷ಺෦ߏ଄ • ࣌ؒෆ଍ʹΑΓஅ೦ʂ·ͨ஻Β͍ͤͯͩ͘͞ʂ • /gitҎԼʹ͢΂ͯ͋Δ • ࢀরͷϦϨʔ • https://www.amazon.co.jp/ΤϯδχΞͷͨΊͷGitͷڭՊॻʦ্ڃฤʧ-Git಺෦ͷ࢓૊ΈΛཧղ͢Δ-Տଜ੟ޛ-ebook/dp/B01AAIN85K
15. Gitૉ๿ͳٙ໰ • push͢ΔͱౖΒΕΔͷͳΜͰ • mergeͬͯͳʹ • pullͬͯͳʹ • rebaseͬͯͳʹ
16. push͢ΔͱౖΒΕΔͷͳΜͰ • ͓·͑ͷbranchͷઌ୺͸remoteͷbranchʹର ͯ͠஗ΕͯΔͥɻremoteͷมߋΛखݩʹmerge ͯ͠΍Γ௚ͯ͘͠ΕΑͳɻ • ͪͳΈʹmergeʹ͸mergeઓུ͕͍͔ͭ͘छྨ͕͋Δɻmerge-strategiesɹhttps://git-scm.com/docs/merge-strategies
    
    <SFKFDUFE>
    
    
    
    
    
    
    
    NBTUFS
    
    NBTUFS
    OPOGBTUGPSXBSE
    FSSPS
    GBJMFE
    UP
    QVTI
    TPNF
    SFGT
    UP
    IPHFIPHF
    IJOU
    6QEBUFT
    XFSF
    SFKFDUFE
    CFDBVTF
    UIF
    UJQ
    PG
    ZPVS
    DVSSFOU
    CSBODI
    JT
    CFIJOE
    IJOU
    JUT
    SFNPUF
    DPVOUFSQBSU
    .FSHF
    UIF
    SFNPUF
    DIBOHFT
    FH
    HJU
    QVMM
    IJOU
    CFGPSF
    QVTIJOH
    BHBJO
    IJOU
    4FF
    UIF
    /PUF
    BCPVU
    GBTUGPSXBSET
    JO
    HJU
    QVTI
    IFMQ
    GPS
    EFUBJMT local remote push
17. Mergeͬͯͳʹ • ͪͳΈʹmergeʹ͸mergeઓུ͕͍͔ͭ͘छྨ͕͋Δɻmerge-strategiesɹhttps://git-scm.com/docs/merge-strategies local remote merge .FSHF
    $PNNJU
18. Pullͬͯͳʹ • fetch + merge • git pull ͱ git pull –rebase ͷҧ͍ͬͯʁਤΛަ͑ͯઆ໌͠·͢ʂ http://kray.jp/blog/git-pull-rebase/ • pullίϚϯυ͸࢖Θͳ͍͍ͯ͘ͱ͍͏આ΋͋Δ • Git pullΛ࢖͏΂͖Ͱͳ͍̏ͭͷཧ༝ http://dqn.sakusakutto.jp/2012/11/git_pull.html SFNPUF௥੻ CSBODI SFNPUF
    CSBODI MPDBM
    CSBODI fetch merge rebase push local remote
19. Rebaseͬͯͳʹ • base(ج४)ͱͳΔbranchΛ࠶౓औΓࠐΉ • commit-id͕มΘΔͷͰݏΘΕΔ͜ͱ΋ • -iͰinteractiveϞʔυɺաڈΛฤू͢Δ • ੋඇ֮͑ͯཉ͍͠ local remote rebase
20. Gitॳ৺ऀΞϯνύλʔϯ • GUI • git add . • όΠφϦϑΝΠϧΛνΣοΫΠϯ
21. GUI • ؾ࣋ͪ͸Θ͔Δɺ͕ͩCLI͔Βͩ • git for windowsΛ͍Εͯgit bash • ΋͘͠͸Linux • GUI͸׳Ε͔ͯΒͶɺ໿ଋͩΑ
22. git add . • ༧ظ͠ͳ͍ϑΝΠϧ͕νΣοΫΠϯ͞ΕΔ • secretϑΝΠϧ • ݸਓ৘ใ • ରࡦ • git add -p • git diff —cached • git status
23. όΠφϦϑΝΠϧΛνΣοΫΠϯ • Git͸มߋʹؔ৺Λ࣋ͭࢥ૝ʹ൓͢Δ • ͱ͸͍͑ɺ΍Βͳ͍Θ͚Ͱ͸ͳ͍(^ ^; • ରࡦ • buildޙͷύοέʔδͳͲ͸makefileΛνΣοΫΠϯ ͠ɺCIͰbuild͠Α͏ • Git LFS(Large File Storage)Λ࢖͓͏
24. GitΛ࢖ͬͨιʔγϟϧίʔσΟ ϯάͷ࿩ • ࣗݾ঺հ • ൃදͷΰʔϧ • VCS(Version Control System)ͷ࿩ • Gitͷ࿩ • GitΛ࢖ͬͨιʔγϟϧίʔσΟϯάͷ࿩ • github / gitlabͷొ৔ • gitflowͱgithub flow
25. Github / Gitlabͷొ৔ • ιʔγϟϧίʔσΟϯάΛڧྗʹࢧ͑Δػೳ • Pull Request / Merge Request • markdownαϙʔτ(github flavored markdown) • CI / CD࿈ܞ
26. Git-flowͱGithub-flow • Git-flow • ϒϥϯνϞσϧɺ·ͨ͸ͦΕΛࢧ͑Δπʔϧ • A successful Git branching model • https://qiita.com/homhom44/items/9f13c646fa2619ae63d0 • Github-flow • Git-flowΑΓγϯϓϧͳϒϥϯνϞσϧ • https://gist.github.com/Gab-km/3705015
27. ·ͱΊ • GitͷϚΠϯυηοτΛ࣋ͱ͏ • GitίϚϯυͷҙຯΛཧղͯ͠࢖͓͏ • Github / GitlabΛ׆༻ָͯ͘͠͠։ൃ͠Α͏