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
Try Git ハンズオン
Search
Matsuo (TAM)
March 02, 2016
Technology
0
210
Try Git ハンズオン
Matsuo (TAM)
March 02, 2016
Tweet
Share
More Decks by Matsuo (TAM)
See All by Matsuo (TAM)
Yeoman で gulp の環境を さらっと作る
tammatsuo
1
850
Other Decks in Technology
See All in Technology
単回帰分析について数式を追いながら実装してみた
kentaitakura
0
500
Autify Company Deck
autifyhq
1
30k
依存ライブラリはどこに?
takesection
0
100
Elementaryを用いたデータ品質の可視化とデータ基盤の運用改善
10xinc
6
1.4k
オブジェクトのおしゃべり大失敗 メッセージングアンチパターン集 / messaging anti-pattern collection
ytake
0
330
期待しすぎずに取り組む両面 TypeScript
shozawa
2
290
オブジェクト指向CSSが叶えたかったことと、CSSのいま / The aims of Object-oriented CSS and the current state of CSS usage
shinkufencer
11
3.6k
ビジネスロジックを「型」で表現するOOPのための関数型DDD / Functional And Type-Safe DDD for OOP
yuitosato
29
11k
継続的テストモデルを実現するためにスリーアミーゴスを用いた10Xでのシフトレフトの事例
nihonbuson
3
160
エバンジェリスト活動を7年やってきて見えてきた、コミュニティとエバンジェリストの関係
soracom
PRO
1
200
エンジニアブランディングチームの KPI / KPI's of engineer branding team
chaspy
1
140
HoneycombとOpenTelemetryでオブザーバビリティに入門してみる
sumiren
2
150
Featured
See All Featured
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
28
5.9k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
6
950
Teambox: Starting and Learning
jrom
126
8.4k
What’s in a name? Adding method to the madness
productmarketing
PRO
14
2.6k
Making the Leap to Tech Lead
cromwellryan
122
8.4k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
272
12k
The Cost Of JavaScript in 2023
addyosmani
13
3.7k
For a Future-Friendly Web
brad_frost
170
8.9k
5 minutes of I Can Smell Your CMS
philhawksworth
199
19k
What the flash - Photography Introduction
edds
64
11k
What's new in Ruby 2.0
geeforr
335
31k
How GitHub (no longer) Works
holman
301
140k
Transcript
KFUG ϋϯζΦϯ GitΛ࢝ΊͯΈΑ͏ʂ (Git + SourceTree ϋϯζΦϯ) 1 sponsored by
2 ✱ ࠓ͔Βͪΐͬͱ͠ΌΔͷͰɺ ͦͷؒʹҎԼΛࢀߟʹ ✱ http://tinyurl.com/git160305 ✱ SourceTree ͷΠϯετʔϧΛɺ ·ͩͷํ͓͍͍ͬͯͯͩ͘͞
͡Ίʹ
TAM + tambourine inc. ʹΑΔ εϙϯαʔυɾϋϯζΦϯͰ͢ 3
4 ✱ גࣜձࣾTAM, גࣜձࣾλϯόϦϯ ✱ ύʔτφʔܕσδλϧϓϩμΫγϣϯ ✱ डୗͷWeb੍࡞͕ओͳ͓ࣄɺ େख͔Βͷ͚Ҋ͕݅΄ͱΜͲ ✱
େࡕ / ౦ژ / γϯΨϙʔϧ Ͱ120ਓ ✱ Git / Gulp / Angular / PHP / Laravel / Slack / Heroku / AWS / monaca etc. ձࣾհ
5 TAM Coworking ✱ ؔϑϩϯτΤϯυUG ษڧձ, ͘͘ձ ຖ݄ͬͯ·͢ (࣍ճ3/21ॕ) ✱
http://www.tam-tam.co.jp/coworking/
6 ✱ ϑϩϯτΤϯυɾόοΫΤϯυΤϯδχΞ ืूதʂ (JavaScript / PHP ͳͲ) ✱ σβΠφʔग़ˠϑϩϯτɾόοΫΤϯυ
྆ํ͍ͬͯΔਓͱ͔ɺόοΫΤϯυˠ σΟϨΫλʔసͱ͔ɻ৭ʑܦݧͰ͖·͢ ✱ ϧʔϧͷগͳ͍ɺۃʹࣗ༝ͳձࣾͰ͢ ✱ “Wantedly TAM” Ͱݕࡧ͔ɺελοϑ·Ͱ ٻਓืू
7 એ͓ΘΓ Git + SourceTree ϋϯζΦϯ ͡Ί·͢
8 ✱ લड़ͷϖʔδݟΒΕ͍ͯ·͔͢ʁ http://tinyurl.com/git160305 ✱ SourceTree ͷΠϯετʔϧ OK? Mac ver.
2.1 / Windows ver. 1.6 ର ४උOK?
9 ✱ όʔδϣϯཧπʔϧͷ໊લ ✱ ཤྺɾϩάΛ࣮֬ʹ͢ ✱ ୭͕ɺͲ͜Λɺ͍ͭɺͲ͏มߋ͔͕ͨ͠ ͔Δ (ߦ୯ҐͰʂ) ✱
ઌฦΓͳͲ͕ى͖ʹ͘͘ɺ҆৺ & ޮత Gitͬͯ??
10 ✱ Git ΛϚεͰૢ࡞Ͱ͖Δ GUI ✱ ϩάࠩΛɺࢹ֮తʹ؆୯ʹ֬ೝͰ͖Δ ✱ Mac Ͱ
Windows Ͱ͑Δ & ແྉ SourceTreeͬͯ??
11 GitϦϙδτϦͷ࡞ ϦϙδτϦͱGit ͷ σʔλΛೖΕΔݿͷ͜ͱɻ ʮϑΝΠϧʯˠʮ৽ن࡞ʯ อଘઌϑΥϧμΛࢦఆ
12 αϯϓϧίʔυΛindex.html ͱͯ͠อଘ
13 ίϛοτ (ݱࡏͷঢ়ଶΛه)
14 ✱ index.html ͷޡࣈΛ֤ࣗฤू͍ͯͩ͘͠͞ ✱ ίϛοτ(ฤूཤྺΛه)͍͖ͯ͠·͢ ✱ ࠩΛࢹ ✱ εςʔδϯά
✱ ίϛοτ ✱ ίϛοτϩάΛ֬ೝ ฤूͯ͠ɺίϛοτ ͋ͳͨͷ1$ ϩʔΧϧϦϙδτϦʹ มߋͨ͠ϑΝΠϧΛొ
15 master ͜ΕΛ܁Γฦ͢ ίϛοτ͕ͲΜͲΜ࿈ͳ͍͖ͬͯ·͢ جຊ͜ͷ܁Γฦ͠Ͱ͢
16 ϒϥϯν ຊͷۄͰ͢
17 master feature develop ϒϥϯνͱ Git ͷίϛοτΛࢬ͔Εͤͨ͞ͷ ֤ϒϥϯνશʹผঢ়ଶͰɺޓ͍ʹӨڹ͞Εͳ͍
18 master ϒϥϯν͕ͳ͍ͱ ৽ػೳΛՃ͍ͯ͠Δ్தʹɺ ۓٸͷमਖ਼͕ඞཁʹͳͬͨΒʁ ͦͷۓٸमਖ਼͚ͩΛΞοϓ͔ͨͬͨ͠Βʁ ۓٸमਖ਼ ৽ػೳՃ ৽ػೳՃ
19 master ϒϥϯν͕ͳ͍ͱ ۓٸमਖ਼ ৽ػೳՃ ৽ػೳՃ ࣮ Git ͷ͏·Έগͳ͍
20 master ϒϥϯν͕͋Δͱ ྫ) “master” ϒϥϯνɺຊ൪αʔόͷσʔλͱಉ͡ (Ϛελʔσʔλ) ୈ1ϑΣʔε͕ެ։ྃ͠·ͨ͠ɺ ୈ2ϑΣʔζʹ͚ͨػೳՃΛ։࢝͠·͢ɻ
21 master feature ϒϥϯν͕͋Δͱ ػೳՃͷͨΊʹɺ”feature” ͱ͍͏ϒϥϯνΛ ࡞Γɺ͜ͷϒϥϯνͰ࡞ۀΛ։࢝͠·͢
22 master fix feature ϒϥϯν͕͋Δͱ ࡞ۀ్தɺٸᬎɺۓٸमਖ਼͕ඞཁʹͳΓ·ͨ͠ʂ master ͔Βɺ৽͘͠ “fix”
ϒϥϯνΛ࡞͠·͢
23 master fix feature ϒϥϯν͕͋Δͱ fix ϒϥϯνͰमਖ਼Λߦ͍ɺmaster ʹ౷߹ɾެ։͠ ·͢ɻ(feature
ϒϥϯνͷ༰ӨڹΛड͚·ͤΜ)
24 master fix feature ϒϥϯν͕͋Δͱ feature ϒϥϯνͰɺػೳՃͷ࡞ۀʹΓ·͢
25 master fix feature ϒϥϯν͕͋Δͱ ػೳՃ͕ྃͨ͠Βɺmaster ʹ౷߹͠ɺ ެ։͠·͢ɻ
26 ✱ Ϛʔδ: ϒϥϯνؒͷσʔλΛ౷߹͢Δ͜ͱ ✱ ࠩɺجຊతʹࣗಈͰө͞ΕΔ (ߦ୯Ґ) Ϛʔδͱ master fix
feature 26
27 ϒϥϯνར༻Πϝʔδ 1. ৽ϝχϡʔͷՃ࡞ۀΛ͠·͢ 2. ࡞ۀ్தʹɺۓٸͷՁ֨मਖ਼͕ൃੜʂ 3. ͬ͘͞ͱۓٸରԠͨ͠ͷͪ 4. ৽ϝχϡʔͷՃ࡞ۀʹΓ·͢
ͬͯΈΑ͏
28 1. ৽ϝχϡʔ༻ͷϒϥϯνΛ࡞Δ 2. <tr> ΛՃɺ৽ϝχϡʔΛૠೖɺ ͨͱ͑Ձ֨ະఆͱͯ͠ίϛοτ 3. master ͔Βۓٸमਖ਼༻ϒϥϯνΛ࡞Δ
4. ۓٸमਖ਼ͯ͠ίϛοτ 5. master ʹϚʔδ 6. ৽ϝχϡʔ༻ϒϥϯνʹͬͯɺ࡞ۀܧଓ ͬͯΈΑ͏
29 master fix-typo add-menu ϒϥϯν͓͞Β͍ ࡞ۀ͝ͱʹϒϥϯν࡞ → ͨ͠ΒmasterʹϚʔδ ଞͷमਖ਼ͱͬͪ͝ΌʹͳΒͣɺεϜʔζʹ࡞ۀͰ͖Δ
30 ✱ αϧͰΘ͔ΔGitೖ Git ΛΘ͔Γ͘͢ਤղ (ψʔϥϘ͞Μ࡞) http://www.backlog.jp/git-guide/ ✱ Git-it ίϚϯυϥΠϯ(ࠇ͍ը໘)Ͱ
Git Λ֮͑ΔͨΊͷڭࡐ (GitHubͷਓ࡞) https://github.com/jlord/git-it ͬͱษڧ͍ͨ͠ͳΒ
31 ✱ ͋Γ͕ͱ͏͍͟͝·ͨ͠ ✱ Ҿ͖ଓ͖ TAM / λϯόϦϯϒʔεΛ ग़͍ͯ͠·͢ɺͥͻཱ͓ͪدΓ͍ͩ͘͞ ✱
ٻਓ Wantedly TAM or Wantedly λϯόϦϯ Ͱݕࡧ ͓ΘΓ