Git Workshop 02 - Speaker Deck

Slide 1

Slide 1 text

(JU8PSLTIPQ 痧✳㔐 ꤫愴蠩

Slide 2

Slide 2 text

㥶卓⡹殹♴聃♶䥢〳⟃꼛♳䩧倬䧮

Slide 3

Slide 3 text

㣐笧 ˖ 㔐瘸⵹♧妄㉏⽷涸㉏겗 ˖ ⴕ佅㻜⡲ ˖ 倞㟞莅ざ⢘ⴕ佅 ˖ 贖椚遼瑳 ˖ ⴕ佅涸溫꬗湡

Slide 4

Slide 4 text

㔐瘸㉏겗

Slide 5

Slide 5 text

䙦랃嫲鯱晝劥꟦涸䊴殯

Slide 6

Slide 6 text

䙦랃嫲鯱晝劥꟦涸䊴殯 ˖ (JU剤鸏⦐䭸⟂〳⟃麨䧭 ˖ ♶麕Ꟛ涮䊨Ⱘ鸒䌢鿪〳⟃䍲⡹刿㺂僒麨䧭 ˖ 4PVSDF5SFF ˖ 9DPEF ˖ ˘瘞瘞 $ git diff [commit-1-id] [commit-2-id]

Slide 7

Slide 7 text

笞麌莅Ꟛ涮ず儘鹎遤儘㥶⡦鋊ⷔⴕ佅

Slide 8

Slide 8 text

笞麌莅Ꟛ涮ず儘鹎遤儘㥶⡦鋊ⷔⴕ佅 ˖ HJUPX剤㛇燊涸崩玑〳⟃黾䗅 ˖ ꆚ㼩笞麌㢵Ꟛ♧佅笞麌欽涸⚺ⴕ佅 ˖ ♶銴雊笞麌ㄤꟚ涮欽ⴕ佅涸Ⰹ㺂湱䊴㣖㢵 git-ﬂow

Slide 9

Slide 9 text

ざ⢘焥ⵌ遼瑳鑪㥶⡦贖椚

Slide 10

Slide 10 text

Ꟛ㼠갤佞崞⹛涸须俲

Slide 11

Slide 11 text

醳绢♧♴

Slide 12

Slide 12 text

(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨劢鄄鷆髠涸墂呪佞㖈TUBHF涸墂呪隶刿䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪

Slide 13

Slide 13 text

(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨劢鄄鷆髠涸墂呪佞㖈TUBHF涸墂呪隶刿䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ git init

Slide 14

Slide 14 text

(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨劢鄄鷆髠涸墂呪佞㖈TUBHF涸墂呪隶刿䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ touch a.txt

Slide 15

Slide 15 text

(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨劢鄄鷆髠涸墂呪佞㖈TUBHF涸墂呪隶刿䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ git add a.txt

Slide 16

Slide 16 text

(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨劢鄄鷆髠涸墂呪佞㖈TUBHF涸墂呪隶刿䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ git commit -m “add a.txt”

Slide 17

Slide 17 text

鹎Ⰵ姻겗

Slide 18

Slide 18 text

#SBODI

Slide 19

Slide 19 text

捀➊랃銴欽#SBODI ˖ ꥬꨆ䊨⡲橇㞯㥶 ˖ 㢵➃⼿⡲ ˖ ♶ずꥣ媯涮⡑TUBHJOH QSPEVDUJPO ˖ ⸆腋鑑⨞

Slide 20

Slide 20 text

倞㟞CSBODI⚛DPNNJU $ cd /to/your/path $ git init $ touch a.txt $ git add a.txt $ git commit -m “add a.txt” $ git branch my-branch $ git checkout my-branch $ touch b.txt $ git add b.txt $ git commit -m “add b.txt” ⯓⹛䩛⨞⨞溏㖈麕玑⚥欽4PVSDF5SFF溏溏䧭卓

Slide 21

Slide 21 text

倞㟞CSBODI ˖ branch倞㟞ⴕ佅涸䭸⟂ ˖ my-branchⴕ佅涸そ珖〳⟃荈㹁纏 $ git branch my-branch

Slide 22

Slide 22 text

ⴗ䳖䊨⡲ⴕ佅 ˖ checkoutⴗ䳖䊨⡲䨾㖈⡙縨涸䭸⟂ ˖ my-branch銴⵹䖃涸⡙縨㖈鸏酭僽➿邍銴⵹ 䖃涸CSBODI $ git checkout my-branch 鑑衽䪪䪪溏HJU鼩〳⟃DIFDLPVU➊랃匌銯

Slide 23

Slide 23 text

ざ⢘㻨岁 $ git branch my-branch $ git checkout my-branch 㥶卓⡹濼麥鸏⦐CSBODI僽倞涸〳⟃鸏垺㻨 $ git checkout -b my-branch

Slide 24

Slide 24 text

倞㟞CSBODI⚛DPNNJU $ cd /to/your/path $ git init $ touch a.txt $ git add a.txt $ git commit -m “add a.txt” $ git checkout -b my-branch $ touch b.txt $ git add b.txt $ git commit -m “add b.txt”

Slide 25

Slide 25 text

ざ⢘CSBODI … (前略略) $ git checkout master $ git merge my-branch ⯓⹛䩛⨞⨞溏㖈麕玑⚥欽4PVSDF5SFF溏溏䧭卓

Slide 26

Slide 26 text

剤尝剤涮欰✫➊랃✲

Slide 27

Slide 27 text

CSBODI♶鋅✫

Slide 28

Slide 28 text

ⴗ䳖䊨⡲ⴕ佅 ˖ checkoutⴗ䳖䊨⡲䨾㖈⡙縨涸䭸⟂ ˖ master銴⵹䖃涸⡙縨㖈鸏酭僽➿邍銴⵹䖃涸 CSBODI⛳㽠僽갸鏤涸⚺銴ⴕ佅 $ git checkout master

Slide 29

Slide 29 text

䘰鱲 ˖ (JU㖈ざ⢘ⴕ佅儘剚㖈䗳銴䞕䕎♴鍸涮䘰鱲堥 ⵖ fast forward Updating 464aead..0169033 Fast-forward 鸏Ⰽ⦐*%㣐㹻剚♶♧垺

Slide 30

Slide 30 text

䘰鱲 ˖ (JU㖈ざ⢘ⴕ佅儘剚㖈䗳銴䞕䕎♴鍸涮䘰鱲堥 ⵖ ˖ 殹㥠錏䖤〫銴獵⹛CSBODI涸剓⵹畮⽰〳㽠剚湬䱺獵⹛♶剚倞㟞♧⦐NFSHF涸DPNNJU ˖ 〫銴鄄ざ⢘鹎涸CSBODI㖈ⴕ佅ⴀ植䖕剤倞涸 DPNNJU㽠♶剚鄄䘰鱲 fast forward

Slide 31

Slide 31 text

鼚⯝䘰鱲 $ git merge --no-ff my-branch

Slide 32

Slide 32 text

鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP

Slide 33

Slide 33 text

鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP

Slide 34

Slide 34 text

鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP

Slide 35

Slide 35 text

鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP

Slide 36

Slide 36 text

遼瑳 $POJDU

Slide 37

Slide 37 text

殹剤Ⰽ⦐ⴕ佅ず儘⥜佖♧⦐墂呪

Slide 38

Slide 38 text

㽠剤〳腋涮欰遼瑳殹NFSHF涸麕玑⚥剤遼瑳涮欰儘㽠剚⚥倬NFSHF

Slide 39

Slide 39 text

遼瑳涸垦爚 ˖ 錚㻌墂呪剤ㆭ❉隶⻋ ˖ 对㹁銴殆ㆭ⦐鿈ⴕ⚛䗳갭銴䪾鸏❉垦爚獵ꤑ ˖ ꬒ竤뀿 <<<<< ===== >>>>>

Slide 40

Slide 40 text

遼瑳鍑对㸤䧭䖕 ˖ 鍑对㸤䧭儘䗳갭DPNNJU • git add . // ઌ೺໨㑚Ճೖ stage • git commit // ࣥߦ commit ˖ 岤䠑搂岁鍑对儘䗳갭銴鷎ⴀNFSHF垸䒭 • git merge --abort ˖ 岤䠑剤㼠呪墂䚍颶涸㼠呪䗳갭銴增叆僽や〳管陼麕ㄤ齅鱀姻焷䩞腋鹎遤NFSHFDPNNJU <<<<< ===== >>>>>

Slide 41

Slide 41 text

ⴕ佅涸溫꬗湡

Slide 42

Slide 42 text

ⴕ佅♶僽♧哭箁劥颶⢵铞

Slide 43

Slide 43 text

ⴕ佅僽➊랃 ˖ HEAD湡⵹䨾㖈涸⡙縨 ˖ ➮㶸衽䭸ぢ涸⡙縨〳⟃僽DPNNJU〳⟃僽♧⦐ CSBODI涸墂呪⡙縨 ˖ #SBODI〫僽♧⦐㶸剤DPNNJUJE涸墂呪 ˖ ⴕ佅僽겳⡂䭸垦涸嚌䙂 ˖ 鮿넓剤鳵岁殥箁ⴀ⢵僽㔔捀➮⦛䭸ⵌ涸DPNNJU剤 QBSFOUDPNNJU

Slide 44

Slide 44 text

cf1dcd… master cf1dcd… NBTUFS )&"% ref: refs/heads/master HEAD

Slide 45

Slide 45 text

〳⟃⨞➊랃✲ 㼭䗱捀♳

Slide 46

Slide 46 text

湡⵹捀姺涸䭸⟂ • git init • git add • git commit -m “message” • git branch • git checkout • git checkout -b • git merge • git merge --no-ff • git merge --abort • git diff

Slide 47

Slide 47 text

籏穡 ˖ 捀➊랃銴欽ⴕ佅 ˖ 㥶⡦䒊用ⴕ佅ㄤざ⢘ⴕ佅 ˖ ➊랃僽捀➊랃剚剤'BTU'PXBSE䘰鱲⟃⿻ 㥶⡦鼚⯝ ˖ 㥶⡦㖈ざ⢘ⴕ佅儘鍑对遼瑳ㄤ岤䠑✲갪 ˖ ⴕ佅涸劥颶僽➊랃