Upgrade to Pro — share decks privately, control downloads, hide ads and more …

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

Sponsored · SiteGround - Reliable hosting with speed, security, and support you can count on. →
Avatar for Yuta Totz Yuta Totz
August 24, 2015
Programming
320
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
140
Working with UNIX Process 6/7 Chapter
Avatar for Yuta Totz totzyuta
1
82
珈琲と僕
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
61

Other Decks in Programming

See All in Programming
MySQLとPostgreSQLって何が違うの？
Avatar for 赤神青空 akagami
0
130
生成AIで帳票OCRが「簡単に」作れる時代になった？
Avatar for Shohei Kondo kon_shou
0
1.1k
仕様駆動開発へのトライを機に チームに適合する手法を模索し続けている話
Avatar for freee freee
PRO
0
590
関東Kaggler会_NVIDIA_Nemotron_コンペ_振り返り
Avatar for rick rick_ds
0
690
変わらないものが、変わるものを決める — 意図駆動開発 × イベントソーシング × イミュータブル | What Doesn't Change Decides What Can — IDD × Event Sourcing × Immutability
Avatar for Tomohisa Takaoka tomohisa
0
1.8k
「寝てても仕事が進む」Claude Codeで組む第二の脳
Avatar for t-fujita24 tomoyafujita2016
0
350
2年かけて Deno に DOMMatrix を実装した話 / How I implemented DOMMatrix in Deno over two years
Avatar for petamoriken / 森建 petamoriken
0
220
S3 を使うアプリケーションをローカル完結で動かすことに全力を注いでみた / Running S3 Apps Offline
Avatar for Daisuke Garaike contour_gara
0
580
Detecting Compromised CI with eBPF and Cilium Tetragon
Avatar for Liz Rice lizrice
0
240
PostgreSQL 18で考えるUUID主キー
Avatar for Kazuhiro Seo kazuhiro1982
0
500
AI Engineeringは、AIプロダクトだけのものか？ 〜AIがソフトウェアを作る時代の新しい当たり前〜 / No AI in your product. AI Engineering in your development.
Avatar for r-kagaya rkaga
5
510
Android CLI
Avatar for Sungyong An fornewid
0
230

Featured

See All Featured
We Have a Design System, Now What?
Avatar for Morgane Peng morganepeng
55
8.3k
Paper Plane (Part 1)
Avatar for Katie Cordina Lindsey katiecoart
PRO
1
10k
What's in a price? How to price your products and services
Avatar for Michael Herold michaelherold
247
13k
Digital Projects Gone Horribly Wrong (And the UX Pros Who Still Save the Day) - Dean Schuster
Avatar for UX Y'all uxyall
1
2.5k
Site-Speed That Sticks
Avatar for Harry Roberts csswizardry
13
1.5k
sira's awesome portfolio website redesign presentation
Avatar for ElsiraPls elsirapls
0
340
My Coaching Mixtape
Avatar for mlcsv mlcsv
0
260
Building Better People: How to give real-time feedback that sticks.
Avatar for Will Jessup wjessup
370
20k
AI: The stuff that nobody shows you
Avatar for John Nunemaker jnunemaker
PRO
9
940
The Illustrated Children's Guide to Kubernetes
Avatar for Chris Short chrisshort
51
53k
Why Our Code Smells
Avatar for Brandon Keepers bkeepers
PRO
340
58k
Primal Persuasion: How to Engage the Brain for Learning That Lasts
Avatar for Mike Taylor tmiket
0
430

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