すごいGit楽しく学ぼう

by MIXI ENGINEERS

Slide 1

Slide 1 text

Learn You a Git for Great Good!

Slide 2

Slide 2 text

ͦ΋ͦ΋ɺGitͬͯ ԿͷͨΊʹ͋ΔΜͩΖ͏ʁ

Slide 3

Slide 3 text

Git͸ɺνʔϜͰͭͷ։ൃʹ औΓ૊Ή͜ͱΛՄೳʹ͠·͢ʂ

Slide 4

Slide 4 text

Git͕ແ͍ͱʜʜ Կ͕มΘ͔ͬͨ෼͔Μͳ͍ʂ ٸʹಈ͔ͳ͘ͳͬͨΜ͚ͩͲʜʜ ࠓ͔Βࢲ͕։ൃ͢ΔͷͰɺΈΜͳ։ൃΛࢭΊͯʂ ͜ͷίʔυ୭͕ॻ͍ͨΜͩΖ͏ʁ

Slide 5

Slide 5 text

ਖ਼௚ਏ͍ʂ

Slide 6

Slide 6 text

Git͕͋Ε͹ʂ ;Ή;Ήɺ͜͏͍ͬͨมߋ͕ՃΘͬͨͷ͔ʂ ಈ͔ͳ͘ͳ͚ͬͨͲɺ͙͢ʹલʹ໭ͤͨʂ ਺ඦਓͰ΋Ұॹʹ։ൃͰ͖ΔΑʂ ͜ͷΫιίʔυΛॻ͍ͨͷ͸ɺ˓˓͞Μ͔ʜʜ

Slide 7

Slide 7 text

ΈΜͳͰ։ൃͰָ͖͍ͯ͠ʂ ✌ Т✌ ࡾ✌ Т ✌ࡾ ✌`Т ✌

Slide 8

Slide 8 text

w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

Slide 9

Slide 9 text

w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

Slide 10

Slide 10 text

࢖ͬͯΈΑ͏ʂͷͦͷલʹ $ git config --global user.name "Amy Mikushi" $ git config --global user.email "[email protected]" Gitʹࣗݾ঺հ ͜͜Ͱొ࿥ͨ͠৘ใ͕(JUͷૢ࡞ʹ͍ͭͯճΔʂ

Slide 11

Slide 11 text

͸͡ΊͯΈΑ͏ $ mkdir books $ cd books $ git init GitϦϙδτϦΛ࡞੒͠Α͏ ϦϙδτϦ͸ɺόʔδϣϯ؅ཧ͢ΔͨΊͷ ஷଂݿͷ͜ͱͰ͢

Slide 12

Slide 12 text

$ find . Α͘Ͱ͖·ͨ͠ʂ ͜ΕͰbooks

Slide 13

Slide 13 text

ঢ়ଶͷ֬ೝ $ git status git

Slide 14

Slide 14 text

ϑΝΠϧͷ௥Ճ Untracked

Slide 15

Slide 15 text

௥ՃΛ֬ೝ Changes

Slide 16

Slide 16 text

͸͡Ίͯͷίϛοτ εςʔδϯάΤϦΞʹஔ͍ͨϑΝΠϧΛεφοϓγϣο τͱͯ͠ɺGit

Slide 17

Slide 17 text

εςʔδϯάΤϦΞͱϦϙδτϦ Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git add ίϛοτ͢Δ४උ͕Ͱ͖ͨΒgit

Slide 18

Slide 18 text

εςʔδϯάΤϦΞͱϦϙδτϦ Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git add ίϛοτ͢Δ४උ͕Ͱ͖ͨΒgit

Slide 19

Slide 19 text

Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git commit add

Slide 20

Slide 20 text

Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git commit add

Slide 21

Slide 21 text

ྺ࢙ΛΈΑ͏ มߋΛอଘͰ͖ΔΑ͏ʹͳΓ·ͨ͠ʂ มߋΛίϛοτͱͯ͠ͲΜͲΜੵΈॏͶ͍ͯ͘͜ͱ͕େࣄͰ͢ ͲΜͳมߋ͖͚ͯͨͬ͠ʜʁͱͳͬͨΒྺ࢙ΛৼΓฦΓ·͠ΐ͏ʂ $ git log աڈͷมߋ ίϛοτ ͕ҰཡͰ͖·͢ ผͷϑΝΠϧΛ௥Ճ͢ΔίϛοτΛߦ͍ɺ࠶౓

Slide 22

Slide 22 text

ϦϞʔτϦϙδτϦΛ࢖ͬͯΈΔ ಉ͡ঢ়ଶ͕ϦϞʔτʹ΋อଘͰ͖·͢ ͍ͭͰ΋໭ͤΔ͠ɺଞͷਓ΋Ҿͬுͬͯ͜Ε·͢ ·ͣ͸ɺGitHubͰϕΞϦϙδτϦΛ࡞੒͠Α͏ʂ https://github.com/new ϕΞϦϙδτϦ͸࡞ۀ༻σΟϨΫτϦΛ࣋ͨͳ͍ .gitͷΈͷϦϙδτϦͰ͢

Slide 23

Slide 23 text

ϦϞʔτϦϙδτϦΛొ࿥͢Δ ϕΞϦϙδτϦΛ࡞੒ͨ͠ΒϦϞʔτϦϙδτϦͱͯ͠ ొ࿥͠Α͏ $ git remote add origin \ [email protected]:/books.git ొ࿥ͨ͠ϦϞʔτϦϙδτϦ͸ɺ$

Slide 24

Slide 24 text

खݩͷมߋΛ্͛ͯΈΑ͏ $ git push -u origin master ϦϞʔτϒϥϯνΛࣗಈͰ௥੻͢ΔΑ͏ʹઃఆ͢Δ ͔࣍Βpull

Slide 25

Slide 25 text

ڞಉ։ൃ͜ͱ͸͡Ί $ cd .. $ git clone [email protected]:/books.git alt_books GitΛ࢖͏͜ͱͰෳ਺ਓͰ͔ΜͨΜʹ։ൃͰ͖·͢ʂ ࠓ͔Βผਓ ͷؾ࣋ͪ ʹͳͬͯମݧͯ͠Έ·͠ΐ͏ ·ͣ͸ϦϞʔτϦϙδτϦΛखݩʹऔΓࠐΈ·͢ alt_booksͱ͍͏໊લͰϦϙδτϦΛෳ੡(clone)Ͱ͖ ͨʂ

Slide 26

Slide 26 text

ڞಉ։ൃ͜ͱ͸͡Ί $ cd alt_books $ vim Crusoe.txt $ git add Crusoe.txt $ git commit $ git push Ͱ͸ɺalt_booksͰ࡞ۀΛ͍͖ͯ͠·͠ΐ͏ pushͨ͠ΒɺGitHubͰ֬ೝͯ͠ΈΑ͏ʂ

Slide 27

Slide 27 text

มߋΛऔΓࠐΉ $ cd ../books $ git pull ଞਓͷߦͬͨ࡞ۀ alt_booksͰߦͬͨ࡞ۀ Λ booksʹऔΓࠐΜͰΈ·͠ΐ͏ ͦΕʹ͸pull

Slide 28

Slide 28 text

มߋΛ֬ೝʂ $ vim Sherlock.txt $ git diff diff

Slide 29

Slide 29 text

มߋΛ֬ೝʂ1BSU $ git add Sherlock.txt $ git diff --staged ͨͩ୯ʹgit

Slide 30

Slide 30 text

ݩʹ໭͢ $ git reset Sherlock.txt ૉ੖Β͍͠ʂमਖ਼ՕॴΛ͙͢ʹ֬ೝ͢Δ͜ͱ͕Ͱ͖ΔΑ ͏ʹͳΓ·ͨ͠ ࣍͸ݩʹ໭͢ํ๏Λ֮͑·͠ΐ͏ addΛऔΓফ͢ʹ͸git

Slide 31

Slide 31 text

ݩʹ໭͢ $ vim Sherlock.txt $ git checkout -- Sherlock.txt ͜ΕͰ޷͖ͳ͚ͩBEEΛͨ͠ΓɺBEEΛऔΓফͨ͠ΓͰ ͖·͢ ࣍͸ϑΝΠϧࣗମΛલճͷίϛοτঢ়ଶʹ໭͢ํ๏Ͱ͢ ίϛοτͯ͠ͳ͍มߋ͸ফ͑ͪΌͬͯݩʹ໭ͤͳ͍ʂ

Slide 32

Slide 32 text

ϒϥϯνΛ࡞Ζ͏ Gitͷ࢖͍ํΛ΄ͱΜͲϚελʔ͠·ͨ͠ʂ ࠷ޙʹGitͷϒϥϯνػೳΛֶͼ·͠ΐ͏ ϒϥϯν͸ɺݱࡏͷίϐʔΛ࡞੒͢ΔػೳͰ͢ ػೳ௥Ճ΍όάमਖ਼ͷࡍ͸ϒϥϯνΛ੾ͬͯ࡞ۀΛਐΊ·͢ ੾ͬͨϒϥϯν͔Β͸͍ͭͰ΋ݩͷmasterϒϥϯνʹ໭ͬ ͯ͘Δ͜ͱ͕Ͱ͖·͢ master͸σϑΥϧτͷϒϥϯν໊Ͱ͢

Slide 33

Slide 33 text

ϒϥϯνΛ࡞Ζ͏ $ git branch clean_up ϒϥϯνΛ੾Δʹ͸ɺgit

Slide 34

Slide 34 text

ϒϥϯνΛ੾Γସ͑ͯΈΑ͏ $ git checkout clean_up clean_up

Slide 35

Slide 35 text

ϑΝΠϧͷ࡟আ $ git rm '*.txt' $ git commit -m "Remove all files" clean_up

Slide 36

Slide 36 text

ϒϥϯνͰߦͬͨ࡞ۀΛऔΓࠐ΋͏ $ git checkout master clean_up

Slide 37

Slide 37 text

ϒϥϯνͰߦͬͨ࡞ۀΛऔΓࠐ΋͏ $ git merge clean_up clean_up

Slide 38

Slide 38 text

ϒϥϯνͷ࡟আ $ git branch -d clean_up ඞཁͷͳ͘ͳͬͨclean_upϒϥϯνΛ࡟আ͠Α͏ git

Slide 39

Slide 39 text

࠷ޙͷpush $ git push ࠷ޙʹࠓ·ͰߦͬͨมߋΛGitHubʹ΋൓өͤ͞Α͏ʂ Git͕࢖͑ΔΑ͏ʹͳͬͨʂ

Slide 40

Slide 40 text

w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

Slide 41

Slide 41 text

ίϛοτͱϒϥϯνͬͯ Ͳ͏͍͏࢓૊ΈͳΜͩΖ͏ʁ

Slide 42

Slide 42 text

ίϛοτͱϒϥϯνΛཧղ͢Δ͜ͱͰ GitΛγϯϓϧʹཧղͰ͖·͢

Slide 43

Slide 43 text

ίϛοτͱ͸ʁ ίϛοτ͸༷ʑͳ৘ใΛ͍࣋ͬͯ·͢ w ϦϏδϣϯ w Tree

Slide 44

Slide 44 text

ίϛοτͱ͸ʁ ίϛοτ͸༷ʑͳ৘ใΛ͍࣋ͬͯ·͢ w ϦϏδϣϯ w Tree

Slide 45

Slide 45 text

ίϛοτʹ͸਌͕͍Δ ͭલͷίϛοτͷϦϏδϣϯΛ࣋ͭͷͰίϛοτʹ͸ ਌͕͍Δʂ ৽͍͠ίϛοτ͔Βݹ͍ίϛοτ͸؆୯ʹ୧ΕΔ

Slide 46

Slide 46 text

࠷ݹͷίϛοτ·Ͱ୧ΕΔ ίϛοτΛ୧͍ͬͯ͘ͱඞͣҰ൪࠷ݹͷίϛοτ·Ͱ ୧Γண͚Δʂ ࠷ݹ ͋ΔͭͷίϛοτΛݟΕ͹ɺͦͷྺ࢙͕෼͔Δ

Slide 47

Slide 47 text

ίϛοτ͸෼͔͚ͬͨͲ ϒϥϯν͸ʁ

Slide 48

Slide 48 text

୯ͳΔಛఆͷίϛοτΛࢦͨ͠ ϙΠϯλͷΑ͏ͳ΋ͷͰ͢ʂ

Slide 49

Slide 49 text

ϒϥϯν σϑΥϧτͷϒϥϯν໊͸master ϒϥϯνͷઌ಄Λࢦ͢ϦϑΝϨϯε͸ɺ ςΩετͰϦϏδϣϯ SHA-1 ͕อଘ͞Ε͍ͯ·͢

Slide 50

Slide 50 text

ϒϥϯν ৽ͨͳnewͱ͍͏໊લͷϒϥϯνΛ࡞੒ͯ͠ΈΔ $ git branch new

Slide 51

Slide 51 text

ϒϥϯν $ git branch new ৽͍͠ͷ͕ग़དྷͨʂ ৽ͨͳnewͱ͍͏໊લͷϒϥϯνΛ࡞੒ͯ͠ΈΔ

Slide 52

Slide 52 text

ϒϥϯνͷجຊ͸͜Ε͚ͩʂ ୯ͳΔϙΠϯλͳͷͰɺϒϥϯν໊͕ ࢖͑Δॴ͸ϦϏδϣϯ͕࢖͑Δ͠ ͦͷٯ΋વΓ

Slide 53

Slide 53 text

ϒϥϯνͷࢬ෼͔Ε ͜ͷঢ়ଶ͔ΒOFXʹίϛοτ͍ͯ͘͠ͱʜʜ

Slide 54

Slide 54 text

ϒϥϯνͷࢬ෼͔Ε Μʁ

Slide 55

Slide 55 text

ϒϥϯνͷࢬ෼͔Ε ࢬ෼͔Εͨ͠ʂ

Slide 56

Slide 56 text

ϒϥϯνͷࢬ෼͔Ε newϒϥϯν͚ͩมߋ͞Ε masterϒϥϯνʹ͸Өڹ͕ͳ͍ʂ

Slide 57

Slide 57 text

ࢲ͸Ͳ͜ʹ͍ΔΜͰ͠ΐ͏͔ʜʜ git

Slide 58

Slide 58 text

HEADϦϑΝϨϯε $ git checkout master

Slide 59

Slide 59 text

HEADϦϑΝϨϯε $ git checkout master

Slide 60

Slide 60 text

HEADϦϑΝϨϯε HEADͷҐஔ͕੾ΓସΘͬͨʂ HEAD͕෇͍͍ͯΔϒϥϯν͸ಛघͳಈ͖Λ͢Δ ෼͔Γ΍͍͢Α͏ʹ·ͣଞʹϒϥϯνΛ੾ͬͯΈΔ $ git branch other

Slide 61

Slide 61 text

HEADϦϑΝϨϯε ͜͜Ͱίϛοτͯ͠ΈΔͱʜʜ master

Slide 62

Slide 62 text

HEADͰࢀর͞Ε͍ͯΔϒϥϯν͸ ίϛοτ͢ΔͨͼʹҠಈ͢Δ

Slide 63

Slide 63 text

ίϛοτͱϒϥϯνʹ͍ͭͯ ෼͔ͬͨʂ

Slide 64

Slide 64 text

w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

Slide 65

Slide 65 text

ྺ࢙ΛऔΓࠐΉϚʔδͬͯ Ͳ͏͍͏࣌ʹ࢖͏ΜͩΖ͏ʁ

Slide 66

Slide 66 text

ΘΓͱͲ͜Ͱ΋࢖͏ʂ

Slide 67

Slide 67 text

ɾνʔϜͰ։ൃ͍ͯ͠Δ࣌ʹ ଞͷਓͷมߋΛऔΓࠐΉͱ͖ ɾਓͰ։ൃ͍ͯ͠Δ࣌ʹෳ਺ͷ ϒϥϯνΛͭʹ·ͱΊΔͱ͖

Slide 68

Slide 68 text

ΘΓͱΑ͋͘Δύλʔϯ Αʔ͠ɺमਖ਼΋ऴΘͬͨ͠αʔόʹ push

Slide 69

Slide 69 text

push

Slide 70

Slide 70 text

ͳͥpushͰ͖ͳ͍ʁ remote repo my repo ͢Ͱʹ৽͍͠ ίϛοτ͕ʂ

Slide 71

Slide 71 text

͜ͷঢ়ଶͰ͸pushͰ͖·ͤΜ Ͳͷίϛοτ͕masterϒϥϯνͷ࠷৽͔෼͔Βͳ͘ͳ Δ͔ΒͰ͢ ҎԼͷΑ͏ͳঢ়ଶΛ࡞Δ͜ͱ͸ग़དྷ·ͤΜ

Slide 72

Slide 72 text

Ͳ͏ͨ͠Β͍͍ͷʁ Ұ౓खݩʹremote

Slide 73

Slide 73 text

มߋΛऔΓࠐΉ remote repo my repo $ git pull origin master

Slide 74

Slide 74 text

remote repo my repo มߋ͕औΓࠐ·Εͨʂ

Slide 75

Slide 75 text

remote repo my repo $ git push origin master

Slide 76

Slide 76 text

remote repo my repo pushͰ͖ͨʂ

Slide 77

Slide 77 text

ΈΜͳͰ։ൃ ͭͷϒϥϯνΛผʑʹมߋͨ࣌͠͸ɺ ଞਓͷมߋΛϚʔδͯ͠push

Slide 78

Slide 78 text

͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

Slide 79

Slide 79 text

͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

Slide 80

Slide 80 text

merge

Slide 81

Slide 81 text

$ git merge topic --ff merge

Slide 82

Slide 82 text

தͷਓ ʮtopicϒϥϯνͬͯmasterͷࠩ෼શ෦ ɹؚΜͰΔ͠ɺҰॹʹͪ͠Ό͑͹Α͘Ͷʁʯ merge

Slide 83

Slide 83 text

தͷਓ ʮϚʔδͨ͠Αʔʯ merge

Slide 84

Slide 84 text

merge

Slide 85

Slide 85 text

͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

Slide 86

Slide 86 text

merge

Slide 87

Slide 87 text

merge

Slide 88

Slide 88 text

merge

Slide 89

Slide 89 text

merge

Slide 90

Slide 90 text

merge

Slide 91

Slide 91 text

merge

Slide 92

Slide 92 text

͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

Slide 93

Slide 93 text

merge

Slide 94

Slide 94 text

$ git merge topic --squash merge

Slide 95

Slide 95 text

தͷਓ ʮtopicͷมߋ಺༰Λѹॖ͠Α͏ʂʯ தͷਓʮͭͷύονʹѹॖͰ͖ͨʂʯ merge

Slide 96

Slide 96 text

merge

Slide 97

Slide 97 text

merge

Slide 98

Slide 98 text

merge

Slide 99

Slide 99 text

merge

Slide 100

Slide 100 text

Ϛʔδ͢Δ಺༰Λѹॖ͠ɺࠩ෼Λݱࡏͷίϛοτʹ ৐͚ͬΔʂ ࠩ෼͸εςʔδϯάΤϦΞʹ৐ͤΒΕΔ͚ͩͳͷͰɺ ίϛοτ͸ࣗ෼Ͱ΍Δඞཁ͕͋Δ merge

Slide 101

Slide 101 text

͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

Slide 102

Slide 102 text

ϦϕʔεͬͯԿʁ ϚʔδͱԿ͕ҧ͏ͷʁ

Slide 103

Slide 103 text

rebase ' ͜Ε͕Ϧϕʔεʂ

Slide 104

Slide 104 text

࣮ࡍϦϕʔε͕Ͳ͏͍͏͜ͱΛ ͢Δͷ͔ͭͣͭݟ͍ͯ͜͏

Slide 105

Slide 105 text

rebase topicϒϥϯνΛrebase͍ͨ͠

Slide 106

Slide 106 text

rebase $ git rebase master

Slide 107

Slide 107 text

' rebase ·ͣίϛοτͷมߋ಺༰ΛͦΕͧΕύονʹ͢Δ

Slide 108

Slide 108 text

rebase topicϒϥϯνΛmasterͱ ಉ͡ҐஔʹҠಈͤ͞Δ

Slide 109

Slide 109 text

rebase ࡞੒͓͍ͯͨ͠ύονΛͭͣͭ ॱʹద༻ͯ͠ίϛοτ͍ͯ͘͠

Slide 110

Slide 110 text

rebase ࠩ෼Λద༻ͯ͠ίϛοτ

Slide 111

Slide 111 text

rebase '

Slide 112

Slide 112 text

rebase '

Slide 113

Slide 113 text

rebase '

Slide 114

Slide 114 text

ର৅ͷϒϥϯνͷ্ʹݱࡏͷϒϥϯνΛ࡞Γ௚͠·͢ rebaseʹΑͬͯ࡞ΒΕͨίϛοτ͸ಉ͡಺༰͚ͩͲผͷ ίϛοτʹͳΔͷͰ஫ҙͰ͢ʂ git

Slide 115

Slide 115 text

ผͷίϛοτʹͳΔ w ϦϏδϣϯ w Tree

Slide 116

Slide 116 text

΍ͬͯ͸͍͚ͳ͍rebase ίϛοτͷ৘ใ͕มΘͬͯ͠·͏ͷͰɺ طʹpush͞Ε͍ͯΔϒϥϯνΛrebaseͯ͠͸͍͚·ͤΜ ଞਓ͕push

Slide 117

Slide 117 text

w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

Slide 118

Slide 118 text

Gitͷ৭ʑͳٕΛֶ΅͏ʂ

Slide 119

Slide 119 text

͜Ε͚ͩ͸֮͑Α͏ $ git

Slide 120

Slide 120 text

gitίϚϯυͰ͸ɺGitͷΑ͘࢖͏ίϚϯυΛҰཡ͢Δ ͜ͱ͕ग़དྷ·͢ ίϚϯυͷৄࡉͳઆ໌Λݟ͍ͨ࣌͸ɺmanΛར༻͠· ͠ΐ͏ ྫ͑͹ɺmergeίϚϯυʹ͍ͭͯৄ͘͠஌Γ͍ͨͱ͖͸ ϋΠϑϯͰܨ͛ͯೖྗ͠·͢ $ man git-merge ͜Ε͚ͩ͸֮͑Α͏

Slide 121

Slide 121 text

git

Slide 122

Slide 122 text

git

Slide 123

Slide 123 text

Ϛʔδ͢Δ࣌ʹ(JU͚ͩͰ͸ղܾͰ͖ͳ͍͜ͱ͕͋Γ·͢ ͦΕ͕ίϯϑϦΫτͰ͢ ίϯϑϦΫτͨ͠৔߹͸ਓ͕ؒղܾ͢Δඞཁ͕͋Γ·͢ ίϯϑϦΫτ͸΋͏͍΍ͩ ೣ͸ղܾ͠ͳ͍

Slide 124

Slide 124 text

ίϯϑϦΫτͨ͠ϑΝΠϧ͸ɺboth

Slide 125

Slide 125 text

ίϯϑϦΫτΛमਖ਼ͯ͠ɺίϛοτ͠·͢ ίϯϑϦΫτ͸΋͏͍΍ͩ b <<<<<<< HEAD ccc ======= c >>>>>>> topic d b ccc d ίϯϑϦΫτղܾ࣌ʹɺίϯϑϦΫτղܾҎ্ͷ͜ͱΛͯ͠͸ ͍͚·ͤΜ Ͳͷ਌ʹ΋ݱΕͳ͍มߋΛ͍ͯ͠ΔϚʔδΛevil

Slide 126

Slide 126 text

git

Slide 127

Slide 127 text

Φϓγϣϯͳ͠ͷgit

Slide 128

Slide 128 text

git

Slide 129

Slide 129 text

ͦΕʹ͸git

Slide 130

Slide 130 text

Ͳ͏͠Α͏΋ͳ͘ͳͬͨ ؒҧͬͯϒϥϯνΛফͯ͠͠·ͬͨ ద౰ʹreset

Slide 131

Slide 131 text

git

Slide 132

Slide 132 text

　ㅤ　ㅤ　ㅤ

Slide 133

Slide 133 text

גࣜձࣾϛΫγΟͰ΋ ΄ͱΜͲͷ෦ॺ͕࢖͍ͬͯ·͢

Slide 134

Slide 134 text

GitHubͷPull

Slide 135

Slide 135 text

ྡͷਓͷGitHubͷϓϩδΣΫτΛϑΥʔΫ͠·͢ ϑΥʔΫͨ͠ϦϙδτϦΛखݩʹΫϩʔϯ͠·͢ ࡞ۀ༻ϒϥϯνΛ࡞੒͠·͢ มߋΛՃ͑ͯίϛοτͯ͠ϓογϡ͠·͢ GitHub͔ΒPull

Slide 136

Slide 136 text

w (JU#PPL w ͜Θ͘ͳ͍(JU w (JUͷ࢓૊Έ ͖ͤ͜ͷٕज़೔ه w ݟ͑ͳ͍νΧϥʲ຋༁ʳ(JUΛϘτϜΞοϓ͔Βཧղ͢Δ w $PEF4DIPPM5SZ(JU ࢀߟจݙ ΈΜͳ΋ಡΜͰΈΑ͏ʂ