Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git Workshop 02
Search
Li-Hsuan Chen
September 29, 2016
Programming
0
100
Git Workshop 02
Li-Hsuan Chen
September 29, 2016
Tweet
Share
More Decks by Li-Hsuan Chen
See All by Li-Hsuan Chen
The UX thinking of PAY ID
vc7
2
430
From Onboarding to Value Delivering in iOS
vc7
0
250
Merciless Refactoring
vc7
0
720
Protocol 的實例、測試和心得
vc7
2
770
共有経済
vc7
0
160
.gitignore
vc7
1
81
Git Workshop 03
vc7
0
110
Escaping Closures in Swift - 公司內分享會
vc7
1
220
Git Workshop 01
vc7
0
160
Other Decks in Programming
See All in Programming
Flutter × Firebase Genkit で加速する生成 AI アプリ開発
coborinai
0
120
法律の脱レガシーに学ぶフロントエンド刷新
oguemon
5
670
Compose でデザインと実装の差異を減らすための取り組み
oidy
1
290
TokyoR116_BeginnersSession1_環境構築
kotatyamtema
0
100
Swiftコンパイラ超入門+async関数の仕組み
shiz
0
200
ISUCON14感想戦で85万点まで頑張ってみた
ponyo877
1
810
バックエンドのためのアプリ内課金入門 (サブスク編)
qnighy
8
1.7k
DMMオンラインサロンアプリのSwift化
hayatan
0
290
『改訂新版 良いコード/悪いコードで学ぶ設計入門』活用方法−爆速でスキルアップする!効果的な学習アプローチ / effective-learning-of-good-code
minodriven
29
5k
Amazon ECS とマイクロサービスから考えるシステム構成
hiyanger
1
320
カンファレンス動画鑑賞会のススメ / Osaka.swift #1
hironytic
0
210
iOSエンジニアから始める visionOS アプリ開発
nao_randd
3
110
Featured
See All Featured
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
9.3k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
356
29k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
232
17k
Stop Working from a Prison Cell
hatefulcrawdad
267
20k
Practical Orchestrator
shlominoach
186
10k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
For a Future-Friendly Web
brad_frost
176
9.5k
4 Signs Your Business is Dying
shpigford
182
22k
Facilitating Awesome Meetings
lara
51
6.2k
Testing 201, or: Great Expectations
jmmastey
41
7.2k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
33
2k
Code Reviewing Like a Champion
maltzj
521
39k
Transcript
(JU8PSLTIPQ 痧✳㔐 ꤫愴蠩
㥶卓⡹殹♴聃♶䥢 〳⟃꼛♳䩧倬䧮
㣐笧 ˖ 㔐瘸♧妄㉏⽷涸㉏겗 ˖ ⴕ佅㻜⡲ ˖ 倞㟞莅ざ⢘ⴕ佅 ˖ 贖椚遼瑳 ˖
ⴕ佅涸溫湡
㔐瘸㉏겗
䙦랃嫲鯱晝劥涸䊴殯
䙦랃嫲鯱晝劥涸䊴殯 ˖ (JU剤鸏⦐䭸⟂〳⟃麨䧭 ˖ ♶麕涮䊨Ⱘ鸒䌢鿪〳⟃䍲⡹刿㺂僒麨䧭 ˖ 4PVSDF5SFF ˖ 9DPEF ˖
˘瘞瘞 $ git diff [commit-1-id] [commit-2-id]
笞麌莅涮ず儘鹎遤儘 㥶⡦鋊ⷔⴕ佅
笞麌莅涮ず儘鹎遤儘 㥶⡦鋊ⷔⴕ佅 ˖ HJUPX剤㛇燊涸崩玑〳⟃黾䗅 ˖ ꆚ㼩笞麌㢵♧佅笞麌欽涸⚺ⴕ佅 ˖ ♶銴雊笞麌ㄤ涮欽ⴕ佅涸Ⰹ㺂湱䊴㣖㢵 git-flow
ざ⢘焥ⵌ遼瑳 鑪㥶⡦贖椚
㼠갤佞崞⹛涸须俲
醳绢♧♴
(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨 劢鄄鷆髠涸墂呪
佞㖈TUBHF涸墂呪隶刿 䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪
(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨 劢鄄鷆髠涸墂呪
佞㖈TUBHF涸墂呪隶刿 䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ git init
(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨 劢鄄鷆髠涸墂呪
佞㖈TUBHF涸墂呪隶刿 䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ touch a.txt
(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨 劢鄄鷆髠涸墂呪
佞㖈TUBHF涸墂呪隶刿 䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ git add a.txt
(JU涸♲⦐ꥣ媯 8PSLJOH%JSFDUPSZ 䊨⡲湡ꏗ 4UBHF *OEFY 程䒸⼦ -PDBM3FQPTJUPSZ 劥㖒⮭㶸䏨 劢鄄鷆髠涸墂呪
佞㖈TUBHF涸墂呪隶刿 䩞〳⟃鄄⸈Ⰵ晝劥䱾ⵖ 鄄晝劥䱾ⵖ涸墂呪 $ git commit -m “add a.txt”
鹎Ⰵ姻겗
#SBODI
捀➊랃銴欽#SBODI ˖ ꥬꨆ䊨⡲橇㞯㥶 ˖ 㢵➃⼿⡲ ˖ ♶ずꥣ媯涮⡑TUBHJOH QSPEVDUJPO ˖ ⸆腋鑑⨞
倞㟞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溏溏䧭卓
倞㟞CSBODI ˖ branch倞㟞ⴕ佅涸䭸⟂ ˖ my-branchⴕ佅涸そ珖〳⟃荈㹁纏 $ git branch my-branch
ⴗ䳖䊨⡲ⴕ佅 ˖ checkoutⴗ䳖䊨⡲䨾㖈⡙縨涸䭸⟂ ˖ my-branch銴䖃涸⡙縨㖈鸏酭僽➿邍銴 䖃涸CSBODI $ git checkout my-branch
鑑衽䪪䪪溏HJU鼩〳⟃DIFDLPVU➊랃匌銯
ざ⢘㻨岁 $ git branch my-branch $ git checkout my-branch 㥶卓⡹濼麥鸏⦐CSBODI僽倞涸
〳⟃鸏垺㻨 $ git checkout -b my-branch
倞㟞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”
ざ⢘CSBODI … (前略略) $ git checkout master $ git merge
my-branch ⯓⹛䩛⨞⨞溏 㖈麕玑⚥欽4PVSDF5SFF溏溏䧭卓
剤尝剤涮欰✫➊랃✲
CSBODI♶鋅✫
ⴗ䳖䊨⡲ⴕ佅 ˖ checkoutⴗ䳖䊨⡲䨾㖈⡙縨涸䭸⟂ ˖ master銴䖃涸⡙縨㖈鸏酭僽➿邍銴䖃涸 CSBODI⛳㽠僽갸鏤涸⚺銴ⴕ佅 $ git checkout master
䘰鱲 ˖ (JU㖈ざ⢘ⴕ佅儘剚㖈䗳銴䞕䕎♴鍸涮䘰鱲堥 ⵖ fast forward Updating 464aead..0169033 Fast-forward 鸏Ⰽ⦐*%㣐㹻剚♶♧垺
䘰鱲 ˖ (JU㖈ざ⢘ⴕ佅儘剚㖈䗳銴䞕䕎♴鍸涮䘰鱲堥 ⵖ ˖ 殹㥠錏䖤〫銴獵⹛CSBODI涸剓畮⽰〳㽠剚湬 䱺獵⹛♶剚倞㟞♧⦐NFSHF涸DPNNJU ˖ 〫銴鄄ざ⢘鹎涸CSBODI㖈ⴕ佅ⴀ植䖕剤倞涸 DPNNJU㽠♶剚鄄䘰鱲
fast forward
鼚⯝䘰鱲 $ git merge --no-ff my-branch
鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP
鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP
鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP
鑬稣➝稲俒畎〳鋅IUUQCJUMZHXOP
遼瑳 $POJDU
殹剤Ⰽ⦐ⴕ佅 ず儘⥜佖♧⦐墂呪
㽠剤〳腋涮欰遼瑳 殹NFSHF涸麕玑⚥剤遼瑳涮欰儘㽠剚⚥倬NFSHF
遼瑳涸垦爚 ˖ 錚㻌墂呪剤ㆭ❉隶⻋ ˖ 对㹁銴殆ㆭ⦐鿈ⴕ⚛䗳갭銴䪾鸏❉垦爚獵ꤑ ˖ ꬒ竤뀿 <<<<< ===== >>>>>
遼瑳鍑对㸤䧭䖕 ˖ 鍑对㸤䧭儘䗳갭DPNNJU • git add . // ઌ㑚Ճೖ stage
• git commit // ࣥߦ commit ˖ 岤䠑搂岁鍑对儘䗳갭銴鷎ⴀNFSHF垸䒭 • git merge --abort ˖ 岤䠑剤㼠呪墂䚍颶涸㼠呪䗳갭銴增叆僽や〳管陼麕ㄤ齅鱀姻焷䩞 腋鹎遤NFSHFDPNNJU <<<<< ===== >>>>>
ⴕ佅涸溫湡
ⴕ佅♶僽♧哭箁 劥颶⢵铞
ⴕ佅僽➊랃 ˖ HEAD湡䨾㖈涸⡙縨 ˖ ➮㶸衽䭸ぢ涸⡙縨〳⟃僽DPNNJU〳⟃僽♧⦐ CSBODI涸墂呪⡙縨 ˖ #SBODI〫僽♧⦐㶸剤DPNNJUJE涸墂呪 ˖ ⴕ佅僽겳⡂䭸垦涸嚌䙂
˖ 鮿넓剤鳵岁殥箁ⴀ⢵僽㔔捀➮⦛䭸ⵌ涸DPNNJU剤 QBSFOUDPNNJU
cf1dcd… master cf1dcd… NBTUFS )&"% ref: refs/heads/master HEAD
〳⟃⨞➊랃✲ 㼭䗱捀♳
湡捀姺涸䭸⟂ • git init • git add <filename> • git
commit -m “message” • git branch <branch name> • git checkout <branch name> • git checkout -b <branch name> • git merge <branch name> • git merge --no-ff <branch name> • git merge --abort • git diff <commit id 1> <commit id 2>
籏穡 ˖ 捀➊랃銴欽ⴕ佅 ˖ 㥶⡦䒊用ⴕ佅ㄤざ⢘ⴕ佅 ˖ ➊랃僽捀➊랃剚剤'BTU'PXBSE䘰鱲⟃⿻ 㥶⡦鼚⯝ ˖ 㥶⡦㖈ざ⢘ⴕ佅儘鍑对遼瑳ㄤ岤䠑✲갪
˖ ⴕ佅涸劥颶僽➊랃
2"儘
5IBOL:PV