Lock in $30 Savings on PRO—Offer Ends Soon! ⏳

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

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

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

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

Avatar for Yuta Totz

Yuta Totz

August 24, 2015
Tweet

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
71
珈琲と僕
Avatar for Yuta Totz totzyuta
0
110
読んで理解するActiveRecordの設計とActiveSupport::Concern
Avatar for Yuta Totz totzyuta
4
1.7k
TDDとVimと
Avatar for Yuta Totz totzyuta
1
540
モテる！筋肉コンパイラ自作入門 - 草食男子からの卒業
Avatar for Yuta Totz totzyuta
0
440
Vimmer幼稚園
Avatar for Yuta Totz totzyuta
2
120
たのしいたーみなる
Avatar for Yuta Totz totzyuta
0
52

Other Decks in Programming

See All in Programming
The Past, Present, and Future of Enterprise Java
Avatar for ivargrimstad ivargrimstad
0
220
実は歴史的なアップデートだと思う AWS Interconnect - multicloud
Avatar for maroon1st maroon1st
0
240
Deno Tunnel を使ってみた話
Avatar for すずとも kamekyame
0
190
Context is King？ 〜Verifiability時代とコンテキスト設計 / Beyond "Context is King"
Avatar for r-kagaya rkaga
10
1.4k
ZOZOにおけるAI活用の現在 ~モバイルアプリ開発でのAI活用状況と事例~
Avatar for ZOZO Developers zozotech
PRO
9
5.9k
ELYZA_Findy AI Engineering Summit登壇資料_AIコーディング時代に「ちゃんと」やること_toB LLMプロダクト開発舞台裏_20251216
Avatar for 株式会社ELYZA elyza
2
450
AIエージェントの設計で注意するべきポイント6選
Avatar for Har1101 har1101
5
1.6k
チームをチームにするEM
Avatar for hitode909 hitode909
0
350
AI時代を生き抜く 新卒エンジニアの生きる道
Avatar for coconala_engineer coconala_engineer
1
370
ローカルLLMを⽤いてコード補完を⾏う VSCode拡張機能を作ってみた
Avatar for NearMeの技術発表資料です nearme_tech
PRO
0
120
大体よく分かるscala.collection.immutable.HashMap ~ Compressed Hash-Array Mapped Prefix-tree (CHAMP) ~
Avatar for matsu_chara matsu_chara
2
220
実はマルチモーダルだった。ブラウザの組み込みAI🧠でWebの未来を感じてみよう #jsfes #gemini
Avatar for n0bisuke n0bisuke2
3
1.3k

Featured

See All Featured
The B2B funnel & how to create a winning content strategy
Avatar for Katarina Dahlin katarinadahlin
PRO
0
170
What does AI have to do with Human Rights?
Avatar for Per Axbom axbom
PRO
0
1.9k
Mobile First: as difficult as doing things right
Avatar for Swwweet swwweet
225
10k
Building an army of robots
Avatar for Kyle Neath kneath
306
46k
Everyday Curiosity
Avatar for Cassini Nazir cassininazir
0
110
Documentation Writing (for coders)
Avatar for Carmen Chung carmenintech
77
5.2k
How To Stay Up To Date on Web Technology
Avatar for Chris Coyier chriscoyier
791
250k
The browser strikes back
Avatar for Jono Alderson jonoalderson
0
66
The Language of Interfaces
Avatar for Des Traynor destraynor
162
25k
The SEO identity crisis: Don't let AI make you average
Avatar for Varn varn
0
32
Money Talks: Using Revenue to Get Sh*t Done
Avatar for Nikki Halliwell nikkihalliwell
0
120
Fantastic passwords and where to find them - at NoRuKo
Avatar for Phil Nash philnash
52
3.5k

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