第2回 Git講座

(JUߨ࠲ ͋͋ͨ͘Μ޻๪

໨࣍ (JUͷ࢝Ίํ GPSLͱϦϞʔτ௥੻ϒϥϯν HJUJHOPSF Ὂ ԋश
ϒϥϯνͷ໋໊نଇ ίϯϑϦΫτͷղফ Ὂ ԋश ࡞ۀϒϥϯν͕ϚʔδઌͷDPNNJU  ͔Β཭Εͯ͠·ͬͨͱ͖ͷରԠ (JU(6*ΫϥΠΞϯτ

(JUͷ࢝Ίํ

˔ ΧϨϯτσΟϨΫτΛ(JUͰ؅ཧ͢ΔͨΊʹ࠷ॳʹ ࣮ߦ͢ΔίϚϯυ ˔ ͜ͷૢ࡞ʹΑͬͯΧϨϯτσΟϨΫτϦҎԼʹHJU σΟϨΫτϦ͕ੜ੒͞ΕΔ init $ cd /path/to/your_project
$ git init $ ls -a | grep .git .git

˔ HJUͷϦϞʔτϦϙδτϦʹؔ܎͢Δ  ίϚϯυ ˔ ॳճ͸ࣄલʹ࡞੒͓͍ͯͨ͠ϦϞʔτ  ϦϙδτϦΛ௥Ճ͢ΔͨΊʹ࢖༻͢Δ ˔ ZPVQSPKFDUHJUˠ޷͖ʹಡΈସ͑ͯ remote $
git remote add origin https://github.com/you/ project.git $ git remote -v origin https://github.com/you/project (fetch) origin https://github.com/you/project (push)

lPSJHJOzͬͯͳʹʁ ˔ ϦϞʔτϦϙδτϦʹผ໊Λ෇͚Δ͜ͱ͕Ͱ͖ɺ  ಉ࣌ʹෳ਺ͷϦϞʔτϦϙδτϦΛѻ͑Δ ˔ ʮϦϞʔτ௥੻ϒϥϯνʯͱ͍͏΋ͷ͕ଘࡏ͠ɺ  ͜ͷͱ͖ͷϦϞʔτͷ໊લʹ্هͷผ໊͕࢖༻͞ΕΔ $ git branch
--all dev * master remotes/origin/HEAD -> origin/master remotes/origin/dev remotes/origin/master

GPSLͱ  ϦϞʔτ௥੻ϒϥϯν

GPSL ˔ ͜Ε͸(JUIVCͳͲϗεςΟϯάαʔϏεͷػೳ ˔ ଞͷ୭͔ͷϦϙδτϦͷෳ੡Λ࡞੒͢Δػೳ ˔ (JUͷΈͷػೳͰ͍ۙ͜ͱΛ࣮ݱ͢Δ͜ͱ͸Մೳ ! UPPUTVJUFNBTUPEPO ͳʹ͕zτΡʔτz͡Όɻ
Զ͸zπΠʔτz͕͍ͨ͠

GPSL ˔ (JUIVCˠ(JUIVC΍#JUCVDLFUˠ#JUCVDLFUͷGPSL͸Ͱ͖ Δ͕ɺ(JUIVCˠ#JUCVDLFU΍ͦͷٯ͸ग़དྷͳ͍ ˔ DMPOFͯ͠ϦϞʔτ63-Λॻ͖׵͑Δ͜ͱͰ͍ۙ͜ͱ͸  ग़དྷΔ ! UPPUTVJUFNBTUPEPO !
ZPVNBTUPEPO \\ZPV^^

GPSL ˔ (JUIVCˠ(JUIVC΍#JUCVDLFUˠ#JUCVDLFUͷGPSL͸Ͱ͖ Δ͕ɺ(JUIVCˠ#JUCVDLFU΍ͦͷٯ͸ग़དྷͳ͍ ˔ DMPOFͯ͠ϦϞʔτ63-Λॻ͖׵͑Δ͜ͱͰ͍ۙ͜ͱ͸  ग़དྷΔ ! UPPUTVJUFNBTUPEPO !
ZPVNBTUPEPO QVTI QVTI º 1VMM 3FRVFTU DMPOF DMPOF ˠͨͩ͠1VMM3FRVFTU͕ૹΕͳ͍

GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH

GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH $ git remote add
upstream https://github.com/tootsuite/ mastodon $ git remote -v | grep upstream upstream https://github.com/tootsuite/mastodon (fetch) upstream https://github.com/tootsuite/mastodon (push) ϦϞʔτ63-Λొ࿥ ʢVQTUSFBNʣ l5PPUzl5XFFUz

GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH $ git fetch upstream
$ git branch --all | grep upstream remotes/upstream/dev remotes/upstream/master ϦϞʔτϒϥϯνΛ GFUDI l5PPUzl5XFFUz

GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH ϦϞʔτ௥੻ϒϥϯνΛ ϩʔΧϧϒϥϯνʹϚʔδ $ git
merge upstream master $ git log --pretty=format:”%h: %s” -2 4c0be41: Fix bug 17ceae2: “Toot” -> “Tweet” l5PPUzl5XFFUz

ϒϥϯν·ͱΊ ! ZPVNBTUPEPO NBTUFS EFW NBTUFS EFW ! UPPUTVJUFNBTUPEPO NBTUFS
EFW ϩʔΧϧ  ϦϙδτϦ ϦϞʔτ  ϦϙδτϦ ϦϞʔτϒϥϯν ϩʔΧϧϒϥϯν SFNPUFTPSJHJONBTUFS SFNPUFTPSJHJOEFW SFNPUFTVQTUSFBNNBTUFS SFNPUFTVQTUSFBNEFW ϦϞʔτ௥੻ϒϥϯν GFUDI GFUDI QVTI PSJHJO VQTUSFBN NFSHF

5JQTlVzΦϓγϣϯ ˔ HJUIVCͰϦϙδτϦΛ࡞Δͱग़ͯ͘Δɺ࠷ॳʹ࣮ߦ  ͢ΔίϚϯυू Ὂ HJUJOJUHJUSFNPUFBEEPSJHJOIUUQTHJUIVCʜ Ὂ HJUBEEHJUDPNNJUNbJOJU` Ὂ HJUQVTIVPSJHJONBTUFS
˔ lVz͸ϩʔΧϧϒϥϯνʹରͯ͠σϑΥϧτͷ  ϦϞʔτ௥੻ϒϥϯνΛઃఆ͢ΔΦϓγϣϯ Ὂ Ҿ਺ແ͠ͰQVMM΍GFUDIͨ͠ͱ͖ͷऔಘઌΛઃఆ͢Δ

HJUJHOPSF

HJU؅ཧͯ͠ཉ͘͠ͳ͍ϑΝΠϧ ˔ ϦϙδτϦʹ͸Ͳ͏ͯ͠΋HJUͰ؅ཧͯ͠ཉ͘͠ͳ͍  ΋ͷ͕ೖΓࠐΉ͜ͱ͕͋Δ Ὂ QZUIPOͷԾ૝؀ڥʢWFOWʣ Ὂ TRMJUFͷσʔλϕʔεϑΝΠϧ Ὂ ίϯύΠϧͯ͠ग़དྷͨόΠφϦ
Ὂ FOWϑΝΠϧͳͲൿີͷ৘ใ͕ೖͬͨϑΝΠϧ ˔ BEE͠ͳ͚Ε͹DPNNJU͞ΕΔ͜ͱ͸ͳ͍͕ʜ Ὂ खಈ؅ཧ͸ϛε͕ى͖΍͘͢ɺྑ͘ͳ͍

HJUJHOPSFϑΝΠϧ ˔ HJU؅ཧͨ͘͠ͳ͍ϑΝΠϧ΍σΟϨΫτϦͷϦετ ˔ HJU؅ཧԼͷϦϙδτϦͷϧʔτʹஔ͘ͷ͕Ұൠత ˔ ͜ͷϑΝΠϧࣗମ͸HJU؅ཧ͢Δ͜ͱʹ஫ҙ # Python __pycache__/
*.pyc # Database file *.sqlite # ignore secret dir src/**/secret ˔ Ͱ࢝·Δߦ͸ίϝϯτ ˔ IPHFͰ֦ுࢠIPHFͷϑΝΠϧ  શͯΛࢦఆ ˔ ͰݸҎ্ͷϑΝΠϧ΍  σΟϨΫτϦʹϚον Ὂ TSDTFDSFU΍  TSDIPHFTFDSFUʹϚον

طʹDPNNJUࡁΈͷϑΝΠϧΛແࢹ ˔ ޙ͔Βແࢹͨ͘͠ͳΔ͜ͱ΋ͨ·ʹ͋Δ ˔ ͨͩ͠ɺ͜ΕΛ࣮ߦͯ͠΋աڈͷDPNNJU͕ফ͑ΔΘ ͚Ͱ͸ͳ͍ͷͰɺύεϫʔυͳͲΛQVTIͯ͠͠·ͬ ͨΒϦϙδτϦ͝ͱ࡞Γ௚ͨ͠ํ͕ૣ͍ # --cachedΦϓγϣϯΛ෇͚ΔͱͦͷϑΝΠϧΛ࡟আͤͣ࢒͢ $
git rm --cached want_to_delete.py # ඞͣ.gitignore΁௥ه͓ͯ͘͠ $ echo want_to_delete.py >> .gitignore

ԋश ࣗ෼ͷ$*4ΞΧ΢ϯτͷ*%ͱύεϫʔυ͕ॻ͖ࠐ·Εͨ  ϑΝΠϧʢTFDSFUUYUʣΛ࡞੒͢Δ HJUTUBUVTίϚϯυΛୟ͍ͯ6OUSBDLFEʹͳ͍ͬͯΔ͜ͱ Λ֬ೝ HJUJHOPSFΛॻ͍ͯHJUBEEBMM
HJUTUBUVTίϚϯυΛୟ͖ɺ·ͩTFDSFUUYU͕දࣔ͞Εͨ ਓͷΞΧ΢ϯτʹϩάΠϯͯ͠ΈΜͳͰ੒੷ΛݟΔ

5JQTͱ͋ΔϑΝΠϧҎ֎શͯΛJHOPSF ˔ ͋ΔσΟϨΫτϦҎԼʹෳ਺ͷϑΝΠϧ͕֨ೲ͞Εͯ ͍Δ͕ɺͭΛআ͍ͯHJU؅ཧͨ͘͠ͳ͍৔߹ ˔ ઌ಄ʹzzΛ෇͚ͨϑΝΠϧσΟϨΫτϦ͸JHOPSF͢ Δର৅͔Βআ֎͞ΕΔʢʹHJUͰ؅ཧ͞ΕΔʣ ˔ ͜ΕΛར༻ۭͯ͠ͷσΟϨΫτϦΛHJUͰ؅ཧͰ͖Δ #
data/ҎԼͷϑΝΠϧΛશͯແࢹ data/* # data/.gitignore͚ͩແࢹ͠ͳ͍ !data/.gitignore data/ !data/.gitignore Ͱ͸ͳ͍͜ͱʹ஫ҙ

ϒϥϯνͷ໋໊نଇ

NBTUFSʹQVTI͢Δͳ ˔ جຊతʹNBTUFS΁͸QVTI͠ͳ͍ ˔ ผͷϒϥϯνʹQVTIͯ͠ݕূɺίʔυϨϏϡʔͳͲ Λ௨ͯ͡NBTUFS΁Ϛʔδ͢Δ͜ͱͰɺNBTUFS͸ৗʹ ಈ࡞͢Δ㲈όά͕গͳ͍ঢ়ଶʹ͓͚ͯ͠Δ ˔ ͋͋ͨ͘Μ޻๪Ͱ͸։ൃʹ࢖༻͢ΔϝΠϯͷϒϥϯν ͸ผͰ༻ҙ͠ɺ͔ͦ͜Βߋʹ֤ػೳ୯ҐɺJTTVF୯Ґ
ͰϒϥϯνΛ෼͚Δ Ὂ ͓͓Αͦ(JUIVC'MPXʹଇͬͨ։ൃʹͳΔ

GFBUVSFϒϥϯνͱpYϒϥϯν ˔ NBTUFS͔Β੾ͬͨϝΠϯͷ։ൃΛߦ͏EFWϒϥϯν  ʹ΋ɺجຊతʹ͸௚઀QVTI͠ͳ͍ ˔ ػೳ୯Ґ͝ͱʹओʹҎԼͷϒϥϯνΛ੾ͬͯӡ༻͢Δ Ὂ GFBUVSFIPHFIPHFػೳΛ։ൃ͢Δϒϥϯν Ὂ pYGVHBGVHBόάΛमਖ਼͢Δϒϥϯν
˔ ͦΕͧΕ։ൃ͕ऴΘͬͨΒEFWϒϥϯν΁  1VMM3FRVFTUΛग़ͯ͠Ϛʔδͯ͠΋Β͏

͋͋ͨ͘Μ޻๪Ͱͷϒϥϯν؅ཧ·ͱΊ ˔ ϝΠϯͷ։ൃϒϥϯν͸EFWFMPQʢ·ͨ͸EFWʣ ˔ NBTUFSʹλάΛଧͬͯϦϦʔε ˔ มߋͷ಺༰ʹԠͯ͡GFBUVSF ͔pY Λ੾Δ ˔
1VMM3FRVFTUΛൃߦͯ͠ϨϏϡʔΛड͚Δ NBTUFS pY EFWFMPQ GFBUVSF W W

5JQTHJUqPX ˔ (JUͷϓϥάΠϯͷҰͭ ˔ ίϚϯυͰϒϥϯν؅ཧͰ͖Δ ˔ ৄࡉ͸આ໌͠ͳ͍ͷͰࣗ෼Ͱௐ΂ͯ NBTUFS EFWFMPQ GFBUVSF
IPUpY SFMFBTF W W

5JQT(JUIVC'MPX ˔ (JU'MPXΑΓ΋γϯϓϧͳϑϩʔ ˔ ͭͷӡ༻ϧʔϧ NBTUFSϒϥϯν͸σϓϩΠՄೳ NBTUFS͔Β࡞ۀϒϥϯνΛ੾Δ
ఆظతʹQVTI͠ɺϩʔΧϧͷόοΫΞοϓΛͱΔ ϓϧϦΫΤετͱϨϏϡʔΛ༻͍Δ 1VMM3FRVFTUΛϚʔδͨ͠Β௚ͪʹσϓϩΠ͢Δ ˔ EFWϒϥϯν΍IPUpYϒϥϯνɺSFMFBTFϒϥϯνΛ ༻ҙ͠ͳ͍

ϒϥϯν؅ཧͷϕετϓϥΫςΟε ˔ ͦΜͳ΋ͷ͸ͳ͍ ˔ ͋͋ͨ͘Μ޻๪Ͱ΋ϝΠϯͷ։ൃͰ͸HJUqPXͱ (JUIVC'MPXΛ৫Γަͥͨख๏Λ࠾༻͍ͯ͠Δ Ὂ ৭Μͳ΋ͷΛࣗ෼Ͱࢼͯ͠Έͯɺྑ͔ͬͨ΋ͷΛ࠾༻͠ ͍ͯ͘ͱྑ͍ͱࢥ͏

ίϯϑϦΫτͷղফ

ίϯϑϦΫτͱ͸ ˔ ฤूͷڝ߹ͷ͜ͱΛࢦ͢ ˔ HJUͷNFSHFૢ࡞ʹΑͬͯࣗಈతʹղফͰ͖ͳ͍มߋ ˔ Α͋͘Δޡղ Ὂ ίϯϑϦΫτΛى͜͢ͷ͸ྑ͘ͳ͍ʂ ˗
େن໛ͳ։ൃʹͳΕ͹ආ͚ΒΕͳ͍͜ͱɻ  ద੾ͳରॲΛ֮͑Δ΂͖ Ὂ ڧ੍తʹϚʔδ͢Ε͹ྑ͘ͳ͍ʁ ˗ ͲͪΒ͔ͷϒϥϯν͕໌֬ʹਖ਼͍͠ͳΒͦΕͰ΋ྑ͍

Ͳ͏͍͏ͱ͖ʹى͜Δ͔ʢҰྫʣ NBTUFS CSBODI" CSBODI# +1 branch-A UFTUUYU VQEBUFCZCSBODI" +1 branch-B
UFTUUYU VQEBUFCZCSBODI# ϑΝΠϧͷ  ಉ͡৔ॴΛ  ผͷϒϥϯν͕  มߋ͍ͯ͠Δ τϐοΫϒϥϯν

ίϯϑϦΫτͤͯ͞ΈΔ ˔ લͷεϥΠυͱಉ͡ঢ়گΛ࠶ݱ͢Δ $ git init && touch test.txt $
git add test.txt && git commit -m ‘init’ $ git checkout -b branch-A && echo branch-A >> test.txt $ git commit -a -m ‘update by branch-A’ $ git checkout master $ git checkout -b branch-B && echo branch-B >> test.txt $ git commit -a -m ‘update by branch-B’ $ git checkout master $ git merge branch-A $ git merge branch-B Auto-merging test.txt CONFLICT (content): Merge conflict in test.txt Automatic merge failed; fix conflicts and then commit the result. ˠϚʔδ੒ޭ ˠϚʔδࣦഊ

मਖ਼ํ๏ɿखಈϚʔδ ˔ ίϯϑϦΫτ͕ൃੜ͢Δͱɺमਖ਼͢Δ·Ͱଞͷૢ࡞͕ Ͱ͖ͳ͍ ˔ ίϯϑϦΫτͨ͠ϑΝΠϧʹϚʔΫ͕ೖΔ UFTUUYU 1 <<<<<<< HEAD
2 branch-A 3 ======= 4 branch-B 5 >>>>>>> branch-B ౷߹ϒϥϯνʢNBTUFSʣͷมߋ τϐοΫϒϥϯνʢCSBODI#ʣͷมߋ

मਖ਼ํ๏ɿखಈϚʔδ UFTUUYU 1 <<<<<<< HEAD 2 branch-A 3 ======= 4
branch-B 5 >>>>>>> branch-B UFTUUYU 1 branch-A 2 branch-B $ git commit -a -m ‘fix conflict’ $ git log --oneline --decorate 1e55543 (HEAD -> master) fix conflict 676fa66 (branch-B) update by branch-B 3f102b2 (branch-A) update by branch-A 72e8ee4 init

मਖ਼ํ๏ɿͲͪΒ͔ʹ߹ΘͤΔ ˔ DIFDLPVUίϚϯυΛ࢖ͬͯ౷߹ϒϥϯν·ͨ͸  τϐοΫϒϥϯνͷͲͪΒ͔ʹڧ੍తʹ߹ΘͤΔ $ git checkout --ours test.txt $
cat test.txt branch-A $ git checkout --theirs test.txt $ cat test.txt branch-B ౷߹ϒϥϯνʢࠓճ͸NBTUFSʣʹ߹ΘͤΔ τϐοΫϒϥϯνʢࠓճ͸CSBODI#ʣʹ߹ΘͤΔ

मਖ਼ํ๏ɿఘΊΔʢमਖ਼ͱ͸ʜʣ ˔ ϚʔδΛࣙΊΔ͜ͱ΋ग़དྷΔ ˔ छྨͷঢ়گʹԠͯ͡ίϚϯυΛબͿ # conflictޙʹԿ΋͍ͯ͠ͳ͍৔߹ $ git merge
--abort # conflictΛमਖ਼͠Α͏ͱ৭ʑ͍ͬͨ͡ޙͷ৔߹ $ git reset --hard HEAD # commit·Ͱ͚ͨ͠Ͳ΍ͬͺΓ΍Ί͍ͨ৔߹ $ git reset --hard ORIG_HEAD

Ϛʔδπʔϧ ˔ ڝ߹ͷϚʔΫ͚ͩோΊͯฤू͢Δͷ͸ࠎ͕ંΕΔ ˔ ֤ϒϥϯνͷϚʔδ͍ͨࠩ͠෼ʹ஫໨ͯ͘͠ΕΔΞγετπʔϧ ͕͋Δ Ὂ HJUNFSHFUPPM ˗ 7JN
΍&NBDT Ͱฤू Ὂ 8JO.FSHF Ὂ +FU#SBJOT੡ͷ*%& Ὂ FUD

࡞ۀϒϥϯν͕  ϚʔδઌͷDPNNJU͔Β  ཭Εͯ͠·ͬͨͱ͖ͷରԠ

ϕʔεϒϥϯν͔Β཭Εͯ͠·͏ঢ়گ ˔ ػೳIPHFΛ࣮૷͢ΔͨΊʹϒϥϯνΛ੾͚ͬͨͲɼ ؾ͍ͮͨΒݩͷEFWϒϥϯνͷ։ൃ͕ਐΜͰͨʜ Ὂ ෳ਺ਓ։ൃͰ͸ී௨ʹ͋Δ͜ͱ ˔ ϕʔεϒϥϯν Ὂ ͜͜Ͱ͸ศ্ٓϒϥϯνͷ෼ذݩϒϥϯνΛ͜͏ݺͿ
EFW GFBUVSFIPHF

˔ ࡞ۀϒϥϯνͷ෼ذݩΛϕʔεϒϥϯνͷ࠷৽ίϛο τʹ߹ΘͤΔ͜ͱ rebase

˔ τϐοΫϒϥϯνʹDIFDLPVU͍ͯ͠Δঢ়ଶͰɺ౷߹ ϒϥϯνʢEFWFMPQʣΛऔΓࠐΉ rebase $ git commit -m 'commit by
topic' $ git log --oneline --decorate * c98b029 (HEAD -> topic) commit by topic * 72e8ee4 (master) init $ git rebase develop First, rewinding head to replay your work on top of it... Applying: commit by develop $ git log --oneline --decorate * c98b029 (HEAD -> topic) commit by topic * 5104883 (develop) commit by develop * 72e8ee4 (master) init

SFCBTFͰίϯϑϦΫτ͕ى͖ͨΒ ˔ SFCBTF͕׬ྃ͢Δ·ͰԼهͷૢ࡞Λ܁Γฦ͢ ίϯϑϦΫτΛղফʢղফํ๏͸NFSHFͱҰॹʣ ղফͨ͠ΒDPOUJOVF $ git rebase
develop # ίϯϑϦΫτϝοηʔδ͸௕͍ͷͰলུ # ԿΒ͔ͷίϯϑϦΫτղফૢ࡞Λͯ͠มߋΛadd͓ͯ͘͠ $ git rebase --continue Applying: commit by develop $ git log --oneline --decorate * c98b029 (HEAD -> topic) commit by topic * 5104883 (develop) commit by develop * 72e8ee4 (master) init

5JQT1VMM3FRVFTUͰͷίϯϑϦΫτ๷ࢭ ˔ 1VMM3FRVFTUग़͢લʹSFCBTFͯ͠࠷৽ͷ౷߹ϒϥϯ νͷมߋʹ߹ΘͤΔ Ὂ ࠷৽ͷ౷߹ϒϥϯνͰ΋ࣗ෼ͷ࣮૷ͨ͠ػೳ͕ಈ͘͜ͱ Λ֬ೝ͢Δͷ͸େࣄ ˔ ·͊ͦΕͰ΋ίϯϑϦΫτ͸ى͖Δ͔Β  ͋·Γؾʹ͠ͳ͍͜ͱʂʂʂʂʂ

ϚʔδͰ͑͑΍Μ ˔ ໘౗ष͍͠ɼϕʔεϒϥϯνͷมߋΛ࡞ۀϒϥϯνʹ  Ϛʔδ͢Ε͹͍͍ͷͰ͸ʁ Ὂ ϩά͕ԚΕΔ ˗ 044։ൃͰ͸سආ͞ΕΔ Ὂ ݸਓͰ΍Δ෼ʹ͸શવ0,
Ὂ ͋͋ͨ͘Μ޻๪Ͱ͸ؾʹ͠·ͤΜ ͍͋ͭͷϚʔδίϛοτͷ ͍ͤͰϩάԚΕͪ·ͬͨͥʜ

(JU(6*ΫϥΠΞϯτ

(6*ΫϥΠΞϯτΛ࢖͏ͱָ ˔ ίϚϯυͷΈͩͱർΕΔ͠ϛε͕ग़΍͍͢ ˔ େࣄͳͷ͸ϓϩμΫτ Ὂ (JUܳਓʹͳΓ͍ͨΘ͚Ͱ͸ͳ͍ Ὂ ΋ͪΖΜίϚϯυΛ೺Ѳ͓ͯ͘͜͠ͱ΋େ੾ HJUCSBODIͰ
ݱࡏͷϒϥϯν Λ֬ೝʜ WJNEJ⒎Ͱมߋͨ͠ ࠩ෼Λ֬ೝͯ͠ʜ ͋ΕɼBEEBMM ͍͍ͯ͠Μ͚ͩͬʁ ίϛοτ*% Կ͚ͩͬʁʁ

ࣗ෼ͷؾʹೖͬͨ΋ͷΛ࢖͓͏ ˔ ͲͷΫϥΠΞϯτ΋Ұ௕Ұ୹ Ὂ ྉۚ Ὂ ͔ͬ͜Α͞ Ὂ ίϯϑϦΫτղফπʔϧ Ὂ
ࠩ෼දࣔํ๏ Ὂ FUD ˔ *%&ʹඪ४౥ࡌ͞Ε͍ͯΔ΋ͷ͚ͩ Ͱ΋े෼࢖͑Δ

4PVSDF5SFF ˔ ѹ౗తར༻཰ ˔ 8JOEPXT .BDରԠ ˔ ແྉ ঎༻ར༻Մ
˔ ଞʹൺ΂ͯ ॏ͍

(JU,SBLFO ˔ ྉۚϓϥϯ༗ Ὂ 'SFFඇ঎༻ Ὂ 1SP঎༻ՄɼϚʔδπʔϧ  ͳͲ Ὂ &OUFSQSJTF(JU)VC
&OUFSQSJTFͱͷ࿈ܞͳͲ ˔ 8JOEPXT .BD -JOVYରԠ ˔ ͔͍͍ͬ͜ɾ(6*͕ચ࿅͞Εͯ Δ

(JUIVC%FTLUPQ ˔ 8JOEPXT .BDରԠ ˔ (JU)VCʹ࠷దԽ Ὂ ࣗ෼ͷ(JU)VCΞΧ΢ϯτͱඥ ͍ͮͯΔͷͰɼϦϙδτϦૢ࡞ ࣌ͷαδΣετͳͲ͕༏ल
˔ γϯϓϧ ˔ 044

͓ർΕ༷Ͱͨ͠

第2回 Git講座

第2回 Git講座

More Decks by Pudding

Other Decks in Programming

Featured

Transcript