Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

Git/GitHub入門-GitHubでたのしいチーム開発

Avatar for Yuta Totz Yuta Totz
August 24, 2015
Programming
330
0

 Git/GitHub入門-GitHubでたのしいチーム開発

岡山大学テクノロジーラボ(OTL)のGitとGitHubについての入門ワークショップのときのスライドです。

Avatar for Yuta Totz

Yuta Totz

August 24, 2015

More Decks by Yuta Totz

See All by Yuta Totz
ウガンダでXcodeをアップデートする方法
Avatar for Yuta Totz totzyuta
0
150
Working with UNIX Process 6/7 Chapter
Avatar for Yuta Totz totzyuta
1
84
珈琲と僕
Avatar for Yuta Totz totzyuta
0
120
読んで理解するActiveRecordの設計とActiveSupport::Concern
Avatar for Yuta Totz totzyuta
4
1.7k
TDDとVimと
Avatar for Yuta Totz totzyuta
1
560
モテる！筋肉コンパイラ自作入門 - 草食男子からの卒業
Avatar for Yuta Totz totzyuta
0
470
Vimmer幼稚園
Avatar for Yuta Totz totzyuta
2
130
たのしいたーみなる
Avatar for Yuta Totz totzyuta
0
62

Other Decks in Programming

See All in Programming
スマートフォンでモールス信号を送受信する 〜スマートフォンのLEDとカメラで作る光通信の設計と実装〜
Avatar for Atsuki Seo atsuki_seo
0
230
カツオ、ご期待ください
Avatar for saku_totomi suneo3476
0
150
WebRTC映像をAirPlayに対応させる挑戦.pdf
Avatar for monolithic-adam monolithic_adam
0
340
AWS CDKのカスタムリソースでContinuum（旧Security Agent）を実装した話 | Implementing Continuum (formerly Security Agent) via AWS CDK Custom Resource
Avatar for アキキー | Akihisa Ikeda akihisaikeda
2
140
Androidだけじゃない、DroidKaigiで広がった私の技術スタック
Avatar for Akio Itaya akkeylab
0
120
Streamlitで実現する自然言語データアプリ開発
Avatar for Ayumu Yamaguchi ayumu_yamaguchi
1
340
Atomic Design, Enforced: Scaling Mobile Design Systems (next.app devCon / droidCon Berlin 2026)
Avatar for Stelios Frantzeskakis steliosf
PRO
0
130
CodeRabbitの効果検証と過ごしてみた3ヶ月
Avatar for armondando armondando
0
160
KiroのSpecで「五目並べ」を作ってみる
Avatar for Satoshi Kaneyasu satoshi256kbyte
1
350
モデルのリファクタリングが難しいと思ったら、そもそも複雑だったのはビジネス仕様だった ? / is-the-business-domain-the-real-complexity
Avatar for hatsu hatsu38
0
450
Security issues being discussed on Web Platforms
Avatar for petamoriken / 森建 petamoriken
0
1.4k
モジュールの視点からSwiftを読み解く #iosdc
Avatar for Shigure Shimotori s_shimotori
0
350

Featured

See All Featured
SEO in 2025: How to Prepare for the Future of Search
Avatar for Michael King ipullrank
3
3.9k
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.7k
jQuery: Nuts, Bolts and Bling
Avatar for Doug Neiner dougneiner
66
8.6k
Navigating Team Friction
Avatar for Lara Hogan lara
192
16k
Fireside Chat
Avatar for paigeccino paigeccino
43
4.1k
Performance Is Good for Brains [We Love Speed 2024]
Avatar for Tammy Everts tammyeverts
12
1.9k
More Than Pixels: Becoming A User Experience Designer
Avatar for Michelle Schulp Hunt marktimemedia
3
550
Getting science done with accelerated Python computing platforms
Avatar for Jacob Tomlinson jacobtomlinson
2
520
[RailsConf 2023] Rails as a piece of cake
Avatar for Vladimir Dementyev palkan
59
7.1k
The SEO identity crisis: Don't let AI make you average
Avatar for Varn varn
0
580
Helping Users Find Their Own Way: Creating Modern Search Experiences
Avatar for Dan Newman danielanewman
31
3.4k
The Cult of Friendly URLs
Avatar for Andy Hume andyhume
79
7k

Transcript

  1. Git/GitHub ௒ೖ໳ GitHubͰͨͷ͍͠νʔϜ։ൃ

  2. ຊ೔ͷΰʔϧ

  3. - Gitͨͷ͍͠ʂ - GitHubͰνʔϜ։ൃؾ͍࣋ͪʂ

  4. git

  5. git ͬͯͳΜ΍Ζ͔…

  6. ෼ࢄόʔδϣϯ؅ཧγεςϜ …Α͚͍Θ͔ΒΜ

  7. ཁ͢Δͱ ෼ࢄ ͯ͠ɺ όʔδϣϯ Λ ؅ཧ͢Δ γεςϜ ͷ͜ͱ

  8. ʮόʔδϣϯ؅ཧʯͬͯ…ʁ

  9. ීஈ΍ͬͯΔ͜ͱ

  10. ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge

  11. ϝϞ.txt ϝϞ ID: hoge ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge2015 ฤूதʜ

  12. ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge ϝϞ.txt ϝϞ ID: hoge2015 ηʔϒʂʂ

  13. ීஈ΍ͬͯΔ͜ͱ ϝϞ.txt ϝϞ ID: hoge ϝϞ.txt ϝϞ ID: hoge2015 ؒҧ͑ͯͨʂʂ

    ໭͍͚ͨ͠Ͳ্ॻ͖ͯ͠Μ͡ΌΜʂʂʂ

  14. όʔδϣϯΛ؅ཧ͍ͨ͠ͱ͖ɺ Ͳ͏͠·͔͢ʁ …Α͚͍Θ͔ΒΜ

  15. ίϐʔͯ͠όοΫΞοϓΛ ͱ͓ͬͯ͘ Ҋͦͷ̍

  16. ίϐʔΛͱ͓ͬͯ͘ ࠷৽൛index.html index.html (લͷ΍ͭ) index-old.html index20510620.html ฤू༻index.html index.html

  17. None

  18. ʮόʔδϣϯ؅ཧʯͱ͸

  19. ηʔϒ͢Δͨͼʹɺ όʔδϣϯΛৼΓ·͢

  20. ʮόʔδϣϯ؅ཧʯͱ͸… ϝϞ.txt มߋ͠·ͨ͠ʂ ϝϞ.txt ηʔϒ͠·ͨ͠ʂ ver. 2 ver. 1

  21. ʮόʔδϣϯ؅ཧʯͱ͸… ϝϞ.txt ϝϞ.txt ΍͹͍ؒҧ͑ͯͨʂ ͔͠΋্ॻ͖ͪ͠Όͬ ͨΑʔʂʂ ver. 2 ver. 1

  22. ͦΜͳͱ͖ʹgitͳΒ ϝϞ.txt Ұݸલʹηʔϒͨ͠ ͱ͜Ζ(ver.1)ʹ໭Δʂ ϝϞ.txt ͜ΕͰ҆৺ʂศརʂ ver. 2 ver. 1

  23. ͢΂ͯͷมߋཤྺΛ؅ཧͰ͖Δ gitͷ͍͍ͱ͜Ζͦͷ̍

  24. gitͷ͜ͱ͹ • ηʔϒ = ίϛοτ (commit) • ϦϙδτϦ = ϑΥϧμ

  25. gitͷ͘͠Έ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit

    merge ࣗ෼ͷ1$ͷத push fetch

  26. ΈΜͳ͕ΈΜͳͷPCͰ ωοτͳͯ͘΋࡞ۀͰ͖Δ gitͷ͍͍ͱ͜Ζͦͷ̎

  27. ͜ΕͰgit࢖͑Δʂ

  28. $ git add FILENAME $ git commit -m “message” $

    git push 1. εςʔδϯάɾΤϦΞʹ௥Ճ 2. ϩʔΧϧͰมߋΛηʔϒ 3. ϩʔΧϧͷηʔϒΛϦϞʔτʹ΋ηʔϒ

  29. $ git add FILENAME $ git commit -m “message” 1.

    εςʔδϯάɾΤϦΞʹ௥Ճ 2. ϩʔΧϧͰมߋΛηʔϒ

  30. $ git add/commit ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM

    TUZMFDTT add/commit ࣗ෼ͷ1$ͷத

  31. $ git add FILENAME $ git commit -m “message” $

    git push 1. εςʔδϯάɾΤϦΞʹ௥Ճ 2. ϩʔΧϧͰมߋΛηʔϒ 3. ϩʔΧϧͷηʔϒΛϦϞʔτʹ΋ηʔϒ

  32. $ git push 3. ϩʔΧϧͷηʔϒΛϦϞʔτʹ΋ηʔϒ

  33. $ git push ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM

    TUZMFDTT ࣗ෼ͷ1$ͷத push

  34. GitHubͱ͸

  35. None

  36. GitHub͸ɺ GitͷϦϙδτϦ ΛϗεςΟϯά͢ΔαʔϏε

  37. gitͷ͘͠Έ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit

    merge ࣗ෼ͷ1$ͷத push fetch (JU)VC
  38. None

  39. νʔϜ։ൃͲ͏΍Μͷ

  40. νʔϜ։ൃͷ΍Γ͔ͨ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ (GitHub͕ϗετ) JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT

    commit merge fetch push

  41. ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖

  42. ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit merge

    fetch push ൴ঁͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit merge fetch push ϦϞʔτϦϙδτϦ (GitHub͕ϗετ)

  43. ϦϞʔτϦϙδτϦ (GitHub͕ϗετ) ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT

    commit merge fetch push ൴ঁͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit merge fetch push ͜Ε͕෼ࢄʂʂʂ

  44. νʔϜ։ൃϑϩʔ

  45. νʔϜ։ൃϑϩʔ • ࣗ෼ͷΞΧ΢ϯτʹσʔλΛෳ੡ (fork) • ϩʔΧϧ(ࣗ෼ͷPCͷத)ʹσʔλΛ࣋ͬͯ͘Δ (clone) • ฤू͢Δ •

    มߋ಺༰Λίϛοτ(ηʔϒ)͢Δ (add/commit) • ίϛοτ಺༰ΛϦϞʔτ(GitHub্ͷιʔε)ʹ൓ө͢Δ (push) • Pull RequestΛͩ͢ (GitHubͷը໘͔Βʂ)

  46. 1. ෳ੡͢Δ (fork) ฤू͍ͨ͠σʔλͷෳ੡Λࣗ෼ͷ GitHubͷΞΧ΢ϯτʹͭ͘Ε·͢ GitHubͷϖʔδ͔Βʂʂ

  47. 1. ෳ੡͢Δ (fork) ϩʔΧϧϦϙδτϦ ϦϞʔτϦϙδτϦ ࣗ෼ͷ1$ͷத (JU)VC ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT

    ΦϦδφϧ

  48. 1. ෳ੡͢Δ (fork) ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ ࣗ෼ͷ1$ͷத fork (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧ

  49. $ git clone https://github… 2. ࣗ෼ͷPCʹ࣋ͬͯ͘Δ (clone) ϦϞʔτ(GitHub)͔Β ϩʔΧϧ(ࣗ෼ͷCP)ʹσʔλΛ͖࣋ͬͯ·͢ *

    URL͸GitHubͷϖʔδ͔Βίϐϖ͠·͢

  50. 2. ࣗ෼ͷPCʹ࣋ͬͯ͘Δ (clone) ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ ࣗ෼ͷ1$ͷத (JU)VC ࣗ෼ͷΞΧ΢ϯτ

    JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ

  51. 2. ࣗ෼ͷPCʹ࣋ͬͯ͘Δ (clone) ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத

    clone (JU)VC ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT

  52. 3. ฤू͢Δ

  53. 3. ฤू͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT

  54. 3. ฤू͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT ฤूͨͬͨ͠ʂʂʂʂ

  55. $ git commit -m “message” 4. ίϛοτ(ηʔϒ)͢Δ ϩʔΧϧʢࣗ෼ͷPCͷதʣͰ มߋ಺༰Ληʔϒʂ $

    git add FILENAME commit(ηʔϒ)͢ΔϑΝΠϧΛબͿ

  56. 4. ίϛοτ(ηʔϒ)͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT

  57. 4. ίϛοτ(ηʔϒ)͢Δ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT add /

    commit ࣗ෼ͷ1$ͷத (JU)VC ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT

  58. $ git push 5. ϦϞʔτʹ൓ө͢Δ (push) ϩʔΧϧʢࣗ෼ͷPCʣͷதͷมߋΛ ϦϞʔτʢGitHub্ʣͷιʔεʹ൓ө͠·͢

  59. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT

  60. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT push

  61. GitHubͷϖʔδ͔Βʂʂ 6. มߋΛऔΓࠐΜͰ΋Β͏ ʢpull requestʣ ΦϦδφϧͷϨϙδτϦʹ ʮ๻ͷมߋΛऔΓࠐΜͰ͘Εʂʯ ͱϦΫΤετ͠·͢

  62. 5. มߋΛऔΓࠐΜͰ΋Β͏ʢpull requestʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத

    (JU)VC ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT

  63. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT PR มߋ͔ͨ͠Βऔ ΓࠐΜͰΑʔʂʂ

  64. 5. ϦϞʔτʹ൓ө͢Δʢpushʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத (JU)VC

    ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ JOEFYIUNM TUZMFDTT PR มߋ͔ͨ͠Βऔ ΓࠐΜͰΑʔʂʂ 0,

  65. 0. ΈΜͳͷมߋΛऔΓࠐΉ $ git pull upstream master ΦϦδφϧͷํͷϦϞʔτʢGitHub্ʣ͕มߋ͞Ε ͍ͯͨΒ࠷৽൛Λࣗ෼ͷιʔεʹऔΓࠐΉ $

    git remote add upstream https:// github.com/okadai-techlab/okayama-u- techlab.com.git ͯ͘Β΅ͷΦϦδφϧͷํ΋ϦϞʔτઌͱͯ͠ొ࿥͢Δ * ొ࿥͸࠷ॳͷҰճ͚ͩͰ͍͍Αʂ ‘upstrem’໊ͬͯલ͡Όͳͯ͘΋͍͍Αʂ

  66. 5. มߋΛऔΓࠐΜͰ΋Β͏ʢpull requestʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத

    (JU)VC ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT ΦϦδφϧʢຊମʣ upstream JOEFYIUNM TUZMFDTT ୭͔͕มߋͨ͠ ʢ࠷৽൛ʣ ෳ੡ origin

  67. 5. มߋΛऔΓࠐΜͰ΋Β͏ʢpull requestʣ ϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT ϦϞʔτϦϙδτϦ JOEFYIUNM TUZMFDTT ࣗ෼ͷ1$ͷத

    (JU)VC ࣗ෼ͷΞΧ΢ϯτ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT pull ΦϦδφϧʢຊମʣ upstream ෳ੡ origin

  68. ൴ঁͱڞಉ࡞ۀΛ͢Δͱ͖ τπΧͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit merge

    push ൴ঁͷϩʔΧϧϦϙδτϦ JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT commit merge pull push ϦϞʔτϦϙδτϦ (GitHub͕ϗετ) upstream JOEFYIUNM TUZMFDTT JOEFYIUNM TUZMFDTT push pull push PR PR ෳ੡ origin

  69. νʔϜ։ൃϑϩʔ • ࣗ෼ͷΞΧ΢ϯτʹσʔλΛෳ੡ (fork) … 1ճ໨͚ͩ • ϩʔΧϧ(ࣗ෼ͷPCͷத)ʹσʔλΛ࣋ͬͯ͘Δ (clone) …

    1ճ໨͚ͩ • ࠷৽൛ΛऔΓࠐΉ (pull) • ฤू͢Δ • มߋ಺༰Λίϛοτ(ηʔϒ)͢Δ (add/commit) • ίϛοτ಺༰ΛϦϞʔτ(GitHub্ͷιʔεorigin)ʹ൓ө͢Δ (push) • ΈΜͳͷมߋΛऔΓࠐΉ (Pull RequestΛͩ͢) -> pullʹ໭Δ

  70. Demo