Skip to content

Oh9yu/git-rebase-practice

Folders and files

NameName
Last commit message
Last commit date

Latest commit

ย 

History

18 Commits
ย 
ย 
ย 
ย 
ย 
ย 

Repository files navigation

>wecode Git Rebase Test

ํ•ด๋‹น ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋Š” git rebase test๋ฅผ ์œ„ํ•œ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์ž…๋‹ˆ๋‹ค.

์‹œํ—˜ ์‹œ๊ฐ„์€ ์ด 2์‹œ๊ฐ„์ด๋ฉฐ, git rebase์— ์ต์ˆ™ํ•ด์งˆ ๋•Œ๊นŒ์ง€ ์—ฐ์Šต์„ ํ•˜์…”๋„ ์ข‹์Šต๋‹ˆ๋‹ค.

์ˆ˜๊ฐ•์ƒ๋ถ„๋“ค์€ ์•„๋ž˜ ์•ˆ๋‚ด์— ๋”ฐ๋ผ ๋‹จ๊ณ„๋ณ„ ๊ณผ์ œ๋ฅผ ์ง„ํ–‰ํ•ด์ฃผ์‹œ๊ธฐ ๋ฐ”๋ž๋‹ˆ๋‹ค.



๐Ÿ“ ์‹œํ—˜ ์•ˆ๋‚ด ๋ฐ ์ดˆ๊ธฐ ์„ธํŒ…

  1. ๋ณธ์ธ github ํŽ˜์ด์ง€๋กœ ์ด๋™ํ•˜์—ฌ repository๋ฅผ ์ƒ์„ฑํ•ด์ฃผ์„ธ์š”.


    image

    repository ์ด๋ฆ„์€ ์•„๋ž˜๊ณผ ๊ฐ™์ด ์„ค์ •ํ•ด์ฃผ์„ธ์š”:

    git-rebase-practice
  2. ์ด ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ฅผ clone ๋ฐ›์•„ 1๋ฒˆ์—์„œ ์ƒ์„ฑํ•œ repository๋กœ remote ์ฃผ์†Œ๋ฅผ ๋ณ€๊ฒฝํ•ด์ฃผ์„ธ์š”.

    • wecode-git-rebase-test ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ฅผ ํด๋ก ํ•ด์ฃผ์„ธ์š”.
    $ git clone https://github.com/wecode-bootcamp-korea/wecode-git-rebase-test.git
    • ํ„ฐ๋ฏธ๋„์—์„œ ํด๋ก  ๋ฐ›์€ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์˜ ๋””๋ ‰ํ† ๋ฆฌ ๊ฒฝ๋กœ๋กœ ์ด๋™ ํ›„ remote ์—ฐ๊ฒฐ์„ ํ•ด์ œํ•ด์ฃผ์„ธ์š”.
    $ git remote remove origin
    • ์ดํ›„ ๊ฐœ์ธ Github์— ์ƒ์„ฑํ•œ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์˜ ์ฃผ์†Œ๋กœ remote๋ฅผ ๋‹ค์‹œ ์—ฐ๋™ํ•ด์ฃผ์„ธ์š”.
    $ git remote add origin https://github.com/[GITHUB_USERNAME]/git-rebase-practice.git
    • ์ƒˆ๋กœ ์ƒ์„ฑํ•˜์—ฌ ์—ฐ๋™ํ•œ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์— ์ดˆ๊ธฐ ์ƒํƒœ์˜ main branch๋ฅผ push ํ•ด์ฃผ์„ธ์š”.
    $ git push -u origin main
  3. ์ดํ›„ ๊นƒ ๋ ˆํŒŒ์ง€ํ† ๋ฆฌ์—์„œ ๋ณธ์ธ์˜ ํฌ์ง€์…˜์— ๋”ฐ๋ฅธ ํด๋”๋กœ ์ด๋™ํ•˜์—ฌ ์•ˆ๋‚ด์— ๋”ฐ๋ผ ๊ณผ์ œ๋ฅผ ์ง„ํ–‰ํ—ค์ฃผ์„ธ์š”.

  4. ๋‹ค๋ฅธ ๊ฐœ๋ฐœ์ž์™€ ํ˜‘์—…์„ ํ•˜๊ธฐ์œ„ํ•ด branch naming๊ณผ commit message์™€ ๊ด€๋ จ๋œ convention์ด ์กด์žฌํ•ฉ๋‹ˆ๋‹ค. ์•„๋ž˜ ์ฐธ๊ณ ์‚ฌํ•ญ ์„ ํ™•์ธํ•˜์—ฌ ์ด๋ฒˆ ์‹œํ—˜์— ์ ์šฉํ•ด์ฃผ์„ธ์š”.



๐Ÿ“ ์ฐธ๊ณ ์‚ฌํ•ญ

ํ•ด๋‹น ์‹œํ—˜์€ ์ ์ˆ˜๋ฅผ ํ‰๊ฐ€ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ์ฃผ๋ณ€ ๋™๊ธฐ๋ถ„๋“ค๊ณผ์˜ ์ถฉ๋ถ„ํ•œ ์˜์‚ฌ์†Œํ†ต๊ณผ ๋‹ค์–‘ํ•œ ์˜คํ”ˆ ์†Œ์Šค๋ฅผ ์ ‘ํ•˜๋ฉด์„œ ๋ฌธ์ œ ํ•ด๊ฒฐ ๋Šฅ๋ ฅ์„ ๋ฐœํœ˜ํ•ด์ฃผ์„ธ์š”.

์ถ”๊ฐ€๋กœ, ๋‹ค๋ฅธ ๊ฐœ๋ฐœ์ž์™€ ํ˜‘์—…์„ ํ•  ์ˆ˜ ์žˆ์œผ๋ฉฐ ์ฝ”๋“œ์˜ ๋ฒ„์ „์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” git๊ณผ github์„ ์ถฉ๋ถ„ํžˆ ํ™œ์šฉํ•˜๊ธฐ ์œ„ํ•ด์„œ๋Š” ๋‹ค์–‘ํ•œ convention๊ณผ ๊ทœ์น™์„ ์ž˜ ์ดํ•ดํ•˜๊ณ  ์žˆ์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค.

ํšŒ์‚ฌ๋งˆ๋‹ค ๋‹ค๋ฅธ convention ๊ทœ์น™์„ ๊ฐ€์ง€๊ณ  ์žˆ์ง€๋งŒ, ์œ„์ฝ”๋“œ์—์„œ ๋”ฐ๋ฅด๊ณ  ์žˆ๋Š” convention ๊ทœ์น™์„ ์ด๋ฒˆ ์‹œํ—˜ ๊ฐ„ ๋ฐ˜๋“œ์‹œ ์ ์šฉํ•ด์ฃผ์„ธ์š”.


Commit message convention

commit ๋ฉ”์‹œ์ง€๋Š” ๋‹ค๋ฅธ ๊ฐœ๋ฐœ์ž๊ฐ€ ๋‚˜์˜ ๊ฐœ๋ฐœ ์ž‘์—…์„ ์ดํ•ดํ•˜๊ธฐ ์‰ฝ๊ฒŒ ์ž‘์„ฑํ•ด ๋†“์€ ์š”์•ฝ๋ณธ์ž…๋‹ˆ๋‹ค. ์•„๋ž˜ ์˜ˆ์‹œ๋ฅผ ์ฐธ๊ณ ํ•˜์—ฌ ์‹œํ—˜์— ๋Œ€ํ•œ ๋‚ด์šฉ์ด ์ถฉ๋ถ„ํžˆ ์ „๋‹ฌ๋  ์ˆ˜ ์žˆ๋„๋ก commit ๋ฉ”์‹œ์ง€๋ฅผ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.

  • ์ปค๋ฐ‹๋ฉ”์‹œ์ง€ ์ž‘์„ฑ ์˜ˆ์‹œ:

    // ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ์„ ๊ตฌํ˜„ํ•˜์—ฌ ์ƒˆ๋กœ์šด ์ฝ”๋“œ๋ฅผ ์ถ”๊ฐ€ํ•˜๋Š” ๊ฒฝ์šฐ
    Add: ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์™„๋ฃŒ
    
    // ์ถ”๊ฐ€๋œ ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ์— ์ˆ˜์ • ์‚ฌํ•ญ์„ ๋ฐ˜์˜ํ•œ ๊ฒฝ์šฐ (Multi-line command)
    Modify: ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์ˆ˜์ •
      - ์ด๋ฉ”์ผ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ ๋กœ์ง ์ˆ˜์ •
      - ๋น„๋ฐ€๋ฒˆํ˜ธ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ ๋กœ์ง ์ˆ˜์ •
    
    // ๋ฒ„๊ทธ๋ฅผ ํ•ด๊ฒฐํ•œ ๊ฒฝ์šฐ
    Fix: ๋กœ๊ทธ์ธ id, pw์— ๊ณต๋ฐฑ ์ž…๋ ฅ ๊ฐ€๋Šฅํ•œ ๋ฒ„๊ทธ ํ”ฝ์Šค
    

์ฐธ๊ณ ๋งํฌ

Commit message Convention.

Github ํ™œ์šฉ๋ฒ• ๋ฐ ์œ ์˜ ์‚ฌํ•ญ

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Contributors