๐ŸŒฑ Git ์‚ฌ์šฉ๋ฒ•

ramramramยท2022๋…„ 7์›” 15์ผ
1
post-thumbnail

๋ฐฐ์›Œ๋„ ๋ฐฐ์›Œ๋„ ๊นŒ๋จน๋Š” git
project ์ˆ˜ํ–‰ํ•˜๋‹ค๊ฐ€ ๋‚˜์˜ branch ๋ง๊ณ  master์— pushํ–ˆ๋˜ ์•„์ฐ”ํ•œ ๊ฒฝํ—˜

    1. How to use git?
    1. git for project

๐Ÿ“Œ git ๋ช…๋ น์–ด ์ •๋ฆฌ

process
๋ณ€๊ฒฝ- add - commit - push - merge


  1. git ์ €์žฅ์†Œ ์ดˆ๊ธฐํ™”
    $ git init
  2. ์ดˆ๊ธฐ git ์„ค์ •
    $ git config
  3. ๋ช…๋ น์–ด ๊ฒ€์ƒ‰
    $ git help '๋ช…๋ น์–ด'
  4. ์ €์žฅ์†Œ ์ƒํƒœ
    $ git status
  5. staging area์— ์ €์žฅ
    $ git add
  6. ๋ณ€๊ฒฝ์‚ฌํ•ญ
    $ git commit -m "๋ณ€๊ฒฝ์‚ฌํ•ญ"
  7. ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
    $ gir branch
  8. ํ˜„์žฌ ์œ„์น˜ํ•˜๊ณ  ์žˆ์ง€ ์•Š์€ ์ €์žฅ์†Œ ์ฒดํฌ์•„์›ƒ
    $ git checkout
  9. ๋กœ์ปฌ์—์„œ ๊นƒํ—ˆ๋ธŒ์— ๋ณ€๊ฒฝ์‚ฌํ•ญ push
    $ git push
  10. ๊นƒํ—ˆ๋ธŒ๋กœ๋ถ€ํ„ฐ ๋ณ€๊ฒฝ์‚ฌํ•ญ ๋‹ค์šด๋กœ๋“œ
    $ git pull
  11. ๋ธŒ๋žœ์น˜์—์„œ ์ž‘์—… ๋๋‚ด๊ณ  ๋ชจ๋“  ํ˜‘์—…์ž๊ฐ€ ๋ณผ ์ˆ˜ ์žˆ๋Š” master๋กœ ๋ณ‘ํ•ฉ
    $ git merge
  12. ํ”„๋กœ์ ํŠธ ํด๋” ๋‚ด init ์ƒ์„ฑ
    $ git init

๐Ÿ“Œ local - github ์—ฐ๊ฒฐํ•˜๊ธฐ

"remote origin already exists." -> ์ด๋ฏธ ์—ฐ๊ฒฐ๋œ ์›๊ฒฉ์ €์žฅ์†Œ๊ฐ€ ์žˆ๋‹ค.
--> git remote remove origin์œผ๋กœ ์—ฐ๊ฒฐ ์ œ๊ฑฐ


  1. github repository ์—ฐ๊ฒฐ -> ์‹คํ–‰ ํ›„ .git ํŒŒ์ผ ์ƒ์„ฑ์œผ๋กœ ์—ฐ๊ฒฐ๋œ ๊ฒƒ ํ™•์ธ
    $ git init
  2. github repository ์—ฐ๊ฒฐ
    $ git remote add origin 'github code ํด๋ฆญ ํ›„ ๋ณต์‚ฌํ•œ url'
    ์—ฐ๊ฒฐ๋œ ๊ฒƒ ํ™•์ธ
    $ git remote -v
  3. pull ๋ณ€๊ฒฝ์‚ฌํ•ญ ์žˆ์„ ์ˆ˜ ์žˆ๊ธฐ ๋•Œ๋ฌธ์— ์ค‘์š”
    $ git pull origin main -> main ๊ฐ€์ ธ์˜ค๊ธฐ
  4. checkout main(master๊ฐ€ ์•„๋‹Œ main์œผ๋กœ ์ด๋ฏธ ์„ค์ •๋˜์–ด ์žˆ๋Š”๊ฒฝ์šฐ ๊ฑด๋„ˆ๋œ€)
    $ git branch main -> main์œผ๋กœ ์ด๋™
    $ git checkout main -> master๋ฅผ main์œผ๋กœ ๋ฐ”๊ฟˆ, master๊ฐ€ main์œผ๋กœ ๋ฐ”๋€ ๊ฒƒ ํ™•์ธ
    $ git branch -d master -> master ์ง€์›€. branch์— main๋งŒ ๋‚จ๊ฒŒ ๋จ
  5. ๊ธฐ์กด ํ”„๋กœ์ ํŠธ๋ฅผ ์Šคํ…Œ์ด์ง€์— commit ํ›„ push
    $ git add. -> gitignore์— ๊ธฐ์žฌ๋œ ๊ฒƒ ์ œ์™ธํ•˜๊ณ  ๋ชจ๋‘ ์ถ”๊ฐ€
    $ git add* -> gitignore์— ๊ธฐ์žฌ๋œ ๊ฒƒ ์ƒ๊ด€์—†์ด ๋ชจ๋‘ ์ถ”๊ฐ€
  6. commit & push
    $ git commit -m '๋ณ€๊ฒฝ์‚ฌํ•ญ'
    $ git push --set-upstream origin main -> upstream์— ์˜ฌ๋ ค์ค€๋‹ค

๐Ÿ“Œ branch - upstream push

ํ˜ผ์ž์„œ branch ์‚ฌ์šฉํ•˜๋ฉฐ branch์— ์ž‘์—… push ํ›„ ์™„์„ฑ๋˜๋ฉด master์— merge


  1. git clone upstream repo -> upstream (main)์„ ๋ณต์‚ฌํ•œ๋‹ค
  2. git pull origin -> ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ์žˆ์„ ์ˆ˜ ์žˆ๊ธฐ ๋•Œ๋ฌธ์— ํ•ญ์ƒ ์ˆ˜ํ–‰ํ•ด์•ผ ํ•œ๋‹ค.
  3. git push-u origin [branch]
  4. merge

๐Ÿ“Œ ์˜ค๋ฅ˜

profile
Industrial Engineering / Data Science / Data analytics

1๊ฐœ์˜ ๋Œ“๊ธ€

comment-user-thumbnail
2022๋…„ 7์›” 18์ผ

Git ๋„ˆ๋ฌด ๋„ˆ๋ฌด ์ค‘์š”ํ•˜์ง€๋งŒ ๋Š˜ ๊นŒ๋จน๋Š”,, ๊ฐ€๋žŒ๋‹˜ ๋•๋ถ„์— ๋ณต์Šตํ–ˆ์Šต๋‹ˆ๋‹ค ใ…Žใ…Ž ๐Ÿ‘

๋‹ต๊ธ€ ๋‹ฌ๊ธฐ