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
web制作におけるGitフロー
Search
井上拓
January 22, 2018
Technology
0
510
web制作におけるGitフロー
広島フロントエンド勉強会 Vol.15 ヒロフロ & AUG広島Git勉強会で発表したスライド
井上拓
January 22, 2018
Tweet
Share
More Decks by 井上拓
See All by 井上拓
これからはじめるGit
takanashi66
0
680
Laravel Mixではじめるwebpack
takanashi66
0
440
gulpやめてLaravel Mixはじめた話
takanashi66
1
180
LT-WordPressの開発をプラグインで管理する
takanashi66
0
320
広島フロントエンド勉強会 Vol.18 『gulpの基本とgulp4』
takanashi66
1
170
CSS Grid Layout Module
takanashi66
0
93
webサイトのiPhone X 対応
takanashi66
0
1.5k
広島フロントエンド勉強会 Vol.12 『CSS Grid Layout Module』
takanashi66
0
280
CSS Grid Layout Module
takanashi66
0
250
Other Decks in Technology
See All in Technology
組織デバイスのための効率的なアプリケーション更新戦略
kenchan0130
0
420
What a Good Platform Looks Like and How to Get There @ Large Financial Organization, Oct 2024
mfpais
PRO
0
120
テストを楽に書きたい
tomorrowkey
2
240
【完全版】Dify - LINE Bot連携 考え方と実用テクニック
uezo
2
770
From LibreOffice to « La Suite » : providing civil servants with Free Software sovereign tools
bluehats
0
110
塩野義製薬様のAWS統合管理戦略:Organizations設計と運用の具体例
tkikuchi
0
270
プロダクト開発の貢献をアピールするための目標設計や認知活動 / Goal design and recognition activities to promote product development contributions.
oomatomo
5
1k
さくっと実践!Postmanを活用した高品質で持続可能なAPI管理
yokawasa
5
290
YAPC::Hakodateの映像記録を支える技術
godan
4
400
Qdrant を用いた検索改善施策の紹介 / Search Engineering Tech Talk 2024 Summer
visional_engineering_and_design
2
260
The People First Approach to Engineering Success - DevNot 2024
zikriyeurkmez
0
200
From naive to advanced RAG: the complete guide
glaforge
0
470
Featured
See All Featured
Understanding Cognitive Biases in Performance Measurement
bluesmoon
26
1.4k
A better future with KSS
kneath
237
17k
Building Adaptive Systems
keathley
38
2.2k
How To Stay Up To Date on Web Technology
chriscoyier
787
250k
The Pragmatic Product Professional
lauravandoore
31
6.2k
Speed Design
sergeychernyshev
23
520
Infographics Made Easy
chrislema
239
18k
Fontdeck: Realign not Redesign
paulrobertlloyd
81
5.2k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
9k
Music & Morning Musume
bryan
46
6.1k
Scaling GitHub
holman
458
140k
Atom: Resistance is Futile
akmur
261
25k
Transcript
pull commit merge checkout branch stash push add diff status
log reset revert rebase rm stash commit diff merge log add checkout pull push commit ώϩϑϩ & AUGౡGitษڧձ ʰweb੍࡞ʹ͓͚ΔGitϑϩʔʱ
Ҫ্ • ϑϩϯτΤϯυΤϯδχΞ • 19916݄6ੜ·Εͷ26ࡀ • ່͔Θ͍͍ • CSS
Nite in HIROSHIMA ࣮ߦһձ෭ҕһ • ϑϩϯτΤϯυษڧձ ओ࠵ • [CodeCode](https://codecodeweb.com/) ࣗݾհ
ࣗݾհ ݄ Ր ਫ ۚ ன ˕
˕ ˕ ˕ ˕ ˕ ൩ ˕ ˕ ˕
ώϩϑϩ & ଂ ʰोͳ͠୲ʑ໙͓͢͢Ίͷ৯ํʱ
͓͢͢Ί ʰމຑ̎ਏ + Թۄ + ωΪՃʱ
pull commit merge checkout branch stash push add diff status
log reset revert rebase rm stash commit diff merge log add checkout pull push commit ώϩϑϩ & AUGౡGitษڧձ ʰweb੍࡞ʹ͓͚ΔGitϑϩʔʱ
ҙ • Git-flowࠓճऔΓѻΘͳ͍ • ͕ࣗ։ൃ͢Δͱ͖ͷख๏Λհ͠·͢
ର • Gitॳ৺ऀ • GitͬͯΔ͚Ͳɺ͏·͑ͯ͘Δ͔Θ͔Βͳ͍ • Α͘ίϯϑϦΫτىͯ͜͠ɺݱΛࠞಱʹؕΕΔਓ
Α͋͘Δϑϩʔ
masterͰ࡞ۀ
masterͱ • GitཧΛ͡Ίͨ࣌ʹ੍࡞͞ΕΔ࠷ॳͷϒϥϯν • ओʹϦϦʔε͞ΕΔίʔυͱಉ͡ίʔυ͕͍Δ • pushͰ͖ͳ͍Α͏ʹͨ͠ΓɺͦͦϩʔΧϧʹ࣋ͨ ͳ͍Α͏ʹͨ͠Γ͞ΕΔ߹
masterͰ࡞ۀ • ϦϦʔε͞ΕΔίʔυʹόά͕ࠞ͡ΔՄೳੑ͕͋Δ • ࡞ۀ͕શʹऴΘ͍ͬͯͳ͍ͱϦϦʔεͰ͖ͳ͍ • ઌߦ։ൃ͕Ͱ͖ͳ͍ • ίϯϑϦΫτ͕ൃੜ͍͢͠
masterͰ࡞ۀ • ϦϦʔε͞ΕΔίʔυʹόά͕ࠞ͡ΔՄೳੑ͕͋Δ • ࡞ۀ͕શʹऴΘ͍ͬͯͳ͍ͱϦϦʔεͰ͖ͳ͍ • ઌߦ։ൃ͕Ͱ͖ͳ͍ • ίϯϑϦΫτ͕ൃੜ͍͢͠
master Πϕϯτϖʔδ࡞ ʑͷߋ৽ Πϕϯτऴྃใࠂ ΠϕϯτΞʔΧΠϒϖʔδެ։ Πϕϯτऴྃ
master ࡞ۀ͕࣌ؒ Γͳ͍ʂʂ ࠓதʹΑΖ͘͠ master Πϕϯτϖʔδ࡞ ʑͷߋ৽ Πϕϯτऴྃใࠂ ΠϕϯτΞʔΧΠϒϖʔδެ։ Πϕϯτऴྃ
ରࡦ
ରࡦ1 ؾ߹͍Ͱ͕ΜΔ • ΠϕϯτऴྃపͰ࡞ۀ ݱ࣮త͡Όͳ͍
ରࡦ2 ίϐʔϖʔδΛ࡞Δ • ϖʔδΛίϐʔͯ͠࡞͓ͬͯ͘ ʑͷߋ৽͕ϞϨͦ͏
ϒϥϯνͷ׆༻
ϒϥϯνͱ • ։ൃͷຊྲྀ͔Βذ͠ɺຊྲྀͷ։ൃΛअຐ͢Δ͜ͱͳ͘࡞ۀΛ ଓ͚Δػೳͷ͜ͱ • Git ͷϒϥϯνϞσϧɺGit ͷػೳͷதͰͬͱ͢Β͠ ͍ͷͩͱ͍͏ਓ͍Δ΄Ͳ •
؆୯ʹ͍͏ͱผͷੈքઢΛͭ͘Δ
ϒϥϯνͷ׆༻ • ฏߦ࡞ۀ༻ʹϒϥϯνΛͭ͘Δ • masterͰʑͷߋ৽Λͭͭ͠ɺdevͰऴྃ࡞ۀ $ git branch dev $
git checkout dev
ϒϥϯνͷ׆༻ • devͰͷ࡞ۀྃޙmastermerge͢Δ $ git checkout master $ git merge
dev
Ϛʔδͱ • ։ൃͷຊྲྀ͔Βذͨ͠ࢧྲྀΛຊྲྀʹ߹ྲྀͤ͞Δ͜ͱ • มߋΛՃ͑ͨϒϥϯνΛɺݩͷϒϥϯνʹϚʔδ͢Δ͜ͱʹΑͬ ͯɺमਖ਼Λྲྀ͠ࠐΉ • ຊྲྀͱࢧྲྀͰಉ͡ՕॴΛมߋ͍ͯͨ͠߹ɺίϯϑϦΫτ͕͓ ͖Δ •
ຊྲྀɺࢧྲྀͲͪΒ͔Λ࠾༻͢Δ͔खಈͰϚʔδ͢Δ
master Πϕϯτϖʔδ࡞ Πϕϯτऴྃ
master Πϕϯτϖʔδ࡞ Πϕϯτऴྃใࠂ dev git checkout -b dev Πϕϯτऴྃ
master Πϕϯτϖʔδ࡞ ʑͷߋ৽ Πϕϯτऴྃใࠂ ΠϕϯτΞʔΧΠϒϖʔδ dev git checkout -b dev
Πϕϯτऴྃ
master Πϕϯτϖʔδ࡞ ʑͷߋ৽ Πϕϯτऴྃใࠂ dev git checkout -b dev git
merge dev ΠϕϯτΞʔΧΠϒϖʔδ Πϕϯτऴྃ
ϒϥϯνΛ͏ͱ • ઌߦ։ൃ͕͍͢͠ • ෳਓ࡞ۀ͕͍͢͠ • ࣌ؒॖ͕Մೳ • ࣮ݧͰࣦഊͯ͠ϒϥϯνΛফͤݩͲ͓Γ
ن͕େ͖͘ͳΔͱ • masterϦϦʔεͷΈ͏ • devͱผʹfeatureϒϥϯνΛͭ͘Δ • feature࣮༧ఆͷ։ൃʹ͏ dev͔Βذͯ͠ɺdevʹϚʔδ͢Δ
Issueͷ׆༻
Issueͱ • GitHubBitbucketͳͲʹ͋ΔΛొ͢ΔϦετ • όάࠓޙ։ൃ༧ఆͷͷΛొ͢Δ
GithubɺBitbucketͱ • ϦϞʔτϦϙδτϦͷϗεςΟϯάαʔϏε • ؆୯ʹ͍͏ͱෳਓͰ࡞ۀ͢Δࡍʹ֤ʑͷมߋ͕ू͞ΕΔ ॴ
Issueͷॻ͖ํ • 1ͭͷIssueʹ1ͭͷ(όά) • λΠτϧ͚ͩͰIssueͷ༰͕ѲͰ͖ΔΑ͏ʹ • ίϝϯτʹ࣮ߦڥɾ࠶ݱखॱɾਖ਼͍͠ڍಈ(Θ͔Ε)Λॻ ͘
None
None
None
None
None
None
None
None
master Πϕϯτϖʔδ࡞ Πϕϯτऴྃ ʑͷߋ৽ Πϕϯτऴྃใࠂ ΠϕϯτΞʔΧΠϒϖʔδެ։ dev git checkout -b
dev git merge dev
master Πϕϯτऴྃ ߋ৽ Πϕϯτऴྃใࠂ ΠϕϯτΞʔΧΠϒϖʔδެ։ dev git checkout -b dev
git merge dev #5 git checkout -b #5 git merge dev όάमਖ਼
IsuueΛ͏ͱ • ToDoϦετ͕Ͱ͖Δ • ొ͢Δͱϝʔϧ͕ಧ͘ͷͰ֬ೝϞϨɾमਖ਼ϞϨ͕͘͢ͳ͍ • εϨουͰΓͱΓͰ͖ΔͷͰޮత • ϥϕϧΛ׆༻͢Δͱͬͱޮత •
ͬͱن͕େ͖͘ͳΔ߹Git FlowΛࢀߟʹ
ϓϧϦΫΤετ
ϓϧϦΫΤετͱ • ίʔυͷมߋΛϨϏϡϫʔʹ௨͠ɺϚʔδΛґཔ͢Δػೳ • ίʔυϨϏϡʔΛड͚Δ͜ͱͰɺόάͷൃݟͳͲίʔυͷ࣭ ͕อͨΕΔ $ git push origin
#5
ϓϧϦΫΤετͷॻ͖ํ • λΠτϧ͚ͩͰϓϧϦΫΤετͷ༰͕ѲͰ͖ΔΑ͏ʹ • ίϝϯτʹมߋΛ؆ܿʹॻ͘ • ͳΔ͘͜·Ίʹɺ1ཁ݅͝ͱ͕·͍͠
None
None
None
None
None
None
None
None
None
None
ϓϧϦΫΤετΛ͏ͱ • ͜ͷఔΛ܁Γฦ͢͜ͱͰɺίʔυͷ࣭͕อͨΕΔ • ίʔυϨϏϡʔ͢Δ͜ͱͰɺษڧʹͳΔ
·ͱΊ
·ͱΊ • masterͰͷ࡞ۀΊ·͠ΐ͏ • ϒϥϯνΛͬͯ࡞ۀΛޮԽͤ͞·͠ΐ͏ • IsuueΛͬͯϞϨͳ͘मਖ਼͠·͠ΐ͏ • ϓϧϦΫΤετͰίʔυϨϏϡʔ͠·͠ΐ͏
͝੩ௌ͋Γ͕ͱ͏͍͟͝·ͨ͠