Git中級者になるためのrebase入門 / Introduction to rebase to become an intermediate Git user

Transcript

1. Git தڃऀʹͳΔͨΊͷ rebase ೖ໳ # ୈ9ճϥϯνLT @takasp 2021೥4݄16೔
2. ࣗݾ঺հ • @takasp a.k.a. tackey • ࡛ۄݝੜ·Ε౦ژҭͪ • झຯɿΪλʔɺϐΞϊ • ྖҬɿόοΫΤϯυ ɹɹɹΠϯϑϥ
3. ௌߨର৅ऀ • Git ͷ add, commit, push ͳͲͷجຊίϚϯυ͸ཧղ ͍ͯ͠Δਓ • rebase ͸஌Βͳ͍ਓ • rebase ͸஌ͬͯΔ͚Ͳɺ࢖ͬͨ͜ͱͳ͍ɺ࢖͚ͬͨͲ Α͘෼͔Βͳ͍ਓ • rebase ΛͲ͏͍͏࣌ʹ࢖ͬͨΒྑ͍͔෼͔Βͳ͍ਓ
4. git rebase ίϚϯυͱ͸ • Ұ࿈ͷίϛοτཤྺΛमਖ਼͢ΔίϚϯυ • ྫ͑͹ • ҎલͷίϛοτϝοηʔδΛमਖ਼͢Δ • ෳ਺ͷίϛοτΛ·ͱΊΔ • ෆཁʹͳͬͨίϛοτΛ࡟আ͢Δ
5. git merge
6. git merge ίϚϯυͷ͓͞Β͍ • ผͷϒϥϯνͷมߋΛऔΓࠐΉ৔߹ • Ϛʔδͷ݁Ռ͸େ͖͘ 3 ͭʹ෼͚ΒΕΔ • Fast Forward : ยํͷϒϥϯν͕ݹ͘ɺऔΓࠐΈઌͷϒϥϯν͕ͦ ͷ··औΓࠐΉ৔߹ • Auto Merge : ಉ͡ϑΝΠϧͷมߋ͕͋ΓɺࣗಈͰϚʔδͰ͖Δ৔߹ • Conflict : ಉ͡ϑΝΠϧͷಉ͡ՕॴΛมߋ͍ͯͯ͠ɺGit ʹ͸൑அ͕ Ͱ͖ͳ͍৔߹
7. git mergeʢFast Forwardʣ • લʹਐΉ͚ͩ 1 2 3 task main
8. git mergeʢFast Forwardʣ • લʹਐΉ͚ͩ 1 2 3 task main merge
9. git mergeʢAuto Mergeʣ • Ϛʔδίϛοτ͕ൃߦ͞ΕΔ 1 2 3 4 task main
10. git mergeʢAuto Mergeʣ • Ϛʔδίϛοτ͕ൃߦ͞ΕΔ 1 2 3 merge 4 task main 5
11. • ಉ͡ߦΛฤू͍ͯͯ͠ Git ͕ղܾͰ͖ͳ͍ git mergeʢConflictʣ 1 2 3 4 task main
12. • ಉ͡ߦΛฤू͍ͯͯ͠ Git ͕ղܾͰ͖ͳ͍ git mergeʢConflictʣ 1 2 3 merge 4 task main Conflict
13. git rebase
14. git mergeʢAuto Mergeʣ࠶ܝ • Ϛʔδίϛοτ͕ൃߦ͞ΕΔ 1 2 3 merge 4 task main 5
15. git rebase • task ϒϥϯν͕ main ϒϥϯνʹ࠶ద༻͞Εɺ Fast Forward ϚʔδͰ͖Δ 1 2 3 4 task main
16. git rebase • task ϒϥϯν͕ main ϒϥϯνʹ࠶ద༻͞Εɺ Fast Forward ϚʔδͰ͖Δ 1 2 3 rebase 4 task main 4’
17. git rebase -i (--interactive) • ҎԼͷૢ࡞͕ߦ͑Δ • drop : ίϛοτΛ࡟আ͢Δ • exec : ίϛοτʹରͯ͠ shell Λ࢖ͬͯίϚϯυΛ࣮ߦ͢Δ • fixup : ίϛοτΛ·ͱΊΔ • squash : ίϛοτΛ·ͱΊͯɺίϛοτϝοηʔδΛฤू͢Δ • edit : ίϛοτʹมߋΛՃ͑Δ • reword : ίϛοτϝοηʔδΛฤू͢Δ • pick : ίϛοτΛݱঢ়ҡ࣋͢Δ
18. merge ͱ rebase ͷҧ͍ • merge • ίϛοτཤྺΛഁյ͠ͳ͍ • ෆཁͳίϛοτ΍Ϛʔδίϛοτ͕ଟ͍ͱ ཤྺΛӾཡͮ͠Β͍ • rebase • ίϛοτཤྺ͕៉ྷʹͳΔ • ҧ͏ίϛοτͱͯ͠࠶࡞੒͞ΕΔ
19. git rebase ͷ஫ҙ఺ • ϦϞʔτϦϙδτϦʹެ։ͨ͠ίϛοτ͸ rebase ͠ͳ͍͜ͱ͕๬·͍͠ • ίϛοτͷվม͕ՄೳͳͷͰɺଞͷϢʔβʔ ͕࢖༻͢Δ৔߹΍ Pull Request ͰϨϏϡʔΛ ड͚Δίϛοτͷ಺༰Λมߋͯ͠͠·͏
20. git rebase Λ࢖͏Ϟνϕʔγϣϯ ͱ࢖͍ಓ • ޙ͔ΒίϛοτཤྺΛݟͨ࣌ʹԿΛ͍ͯ͠Δ͔ ෼͔Γ΍͍ͨ͘͢͠ • ϩʔΧϧϒϥϯνʹϚʔδίϛοτΛੜ੒ͤͣ ʹɺϦϞʔτϒϥϯνͷมߋΛऔΓࠐΈ͍ͨ࣌ • ίϛοτͷॱ൪Λม͍͑ͨͱ͖ • ίϛοτΛ·ͱΊ͍ͨͱ͖
21. git pull
22. ϦϞʔτ௥੻ϒϥϯνͱ ্ྲྀϒϥϯν ϩʔΧϧϦϙδτϦ ϦϞʔτϦϙδτϦ NBJO UBTL PSJHJONBJO PSJHJOUBTL NBJO UBTL ϦϞʔτ௥੻ϒϥϯν origin #
    ͸
    "
    ͷ্ྲྀϒϥϯν "
    ͸
    #
    ͷϦϞʔτ௥੻ϒϥϯν B B A A ϩʔΧϧ ϒϥϯν
23. git pull ͷڍಈ • git pull = git fetch + git merge • git fetch : ϦϞʔτϦϙδτϦͷมߋΛ ϦϞʔτ௥੻ϒϥϯνʹऔΓࠐΉ • git pull ίϚϯυͰҾ਺Λলུͯ͠΋ಈ࡞͢Δ ͷ͸ɺ্ྲྀϒϥϯν͕ઃఆ͞Ε͍ͯΔͨΊ
24. git pull ͷڍಈ ϩʔΧϧϦϙδτϦ ϦϞʔτϦϙδτϦ NBJO UBTL PSJHJONBJO PSJHJOUBTL NBJO UBTL ϦϞʔτ௥੻ϒϥϯν origin ϩʔΧϧ ϒϥϯν git merge git fetch git pull
25. git pull -r (--rebase) • git merge ͷڍಈΛ git rebase ʹม͑Δ͜ͱ͕Ͱ͖Δ • git pull ࣌ʹൃੜՄೳੑͷ͋ΔϚʔδίϛοτΛ ࡞੒ͨ͘͠ͳ͍৔߹΍ίϛοτϩάΛ៉ྷʹ ͠ͳ͕ΒมߋΛऔΓࠐΈ͍ͨ৔߹ʹ࢖༻͢Δ • git rebase ͷίϛοτվมͷՄೳੑ͕͋ΔͷͰɺ push લͳͲͷར༻ʹݶΔ΄͏͕ྑ͍
26. git pull -r ͷڍಈ ϩʔΧϧϦϙδτϦ ϦϞʔτϦϙδτϦ NBJO UBTL PSJHJONBJO PSJHJOUBTL NBJO UBTL ϦϞʔτ௥੻ϒϥϯν origin ϩʔΧϧ ϒϥϯν git rebase git fetch git pull -r
27. DEMO
28. ·ͱΊ
29. ·ͱΊ • git rebase Λ࢖͏ͱίϛοτཤྺ͕៉ྷʹͳΔ • ίϛοτվมΛ൐͏ͷͰ༻๏༻ྔΛकͬͯ࢖͍ ·͠ΐ͏