๋ฐ˜์‘ํ˜•
kkh1902
Steadily
kkh1902
์ „์ฒด ๋ฐฉ๋ฌธ์ž
์˜ค๋Š˜
์–ด์ œ
  • ๋ถ„๋ฅ˜ ์ „์ฒด๋ณด๊ธฐ (151)
    • ๐Ÿ“š Study (1)
      • Spring (9)
      • Java (2)
      • Html, css (10)
      • JS, JQuery (29)
      • DB (5)
      • DevOps (13)
      • roadmap (2)
      • Architecture (1)
      • Flutter (2)
    • ๐Ÿ’ป Computer Science (28)
      • Datastructure (0)
      • Algorithm (2)
      • Design pattern (0)
      • Network (1)
      • DB (13)
      • Operating System (0)
      • Software Engineering (4)
      • CS interview (5)
      • topcit (3)
    • โš’๏ธ Etc (4)
      • Error (3)
      • Trouble_Shooting (1)
    • ๐Ÿ“ฐ News (0)
      • daily (7)
      • think (17)
    • ๐Ÿ“˜ Hobby (13)
      • English (13)
    • ๐Ÿค– AI (7)
      • ML (7)

๋ธ”๋กœ๊ทธ ๋ฉ”๋‰ด

  • ๐Ÿ“‹ ์ด๋ ฅ์„œ
  • โšก๏ธ ๊นƒํ—ˆ๋ธŒ
  • ํƒœ๊ทธ
  • ๋ฐฉ๋ช…๋ก

๊ณต์ง€์‚ฌํ•ญ

์ธ๊ธฐ ๊ธ€

ํƒœ๊ทธ

  • Wonder # word
  • sourcetreee
  • React JS # 2 The Basic of React
  • git
  • React JS # ์ž์Šต์„œ # Component์™€ Props
  • junit5
  • React๋ฅผ ๋ฐฐ์›Œ์•ผํ•˜๋Š” ์ด์œ 
  • testcode
  • gitaction
  • think #bootstrap์„ ์จ์•ผํ•˜๋Š” ์ด์œ 
  • React JS #์ž์Šต์„œ
  • git stash
  • db
  • SpringBootTest
  • Qr_payment project # CSS ํ•ด์„ # Basic ๋งจ์œ„ ํ•ด์„
  • React # JSX
  • Flutter
  • ์†Œํ”„ํŠธ์›จ์–ด ๊ณตํ•™ # chapter1
  • ์†Œํ”„ํŠธ์›จ์–ด ๊ณตํ•™ #project๋งŒ๋“ค๋•Œ ์ค‘์š”
  • Linear Regression

์ตœ๊ทผ ๋Œ“๊ธ€

์ตœ๊ทผ ๊ธ€

ํ‹ฐ์Šคํ† ๋ฆฌ

250x250
hELLO ยท Designed By ์ •์ƒ์šฐ.
๊ธ€์“ฐ๊ธฐ / ๊ด€๋ฆฌ์ž
kkh1902

Steadily

Git Flow
๐Ÿ“š Study/DevOps

Git Flow

2023. 7. 2. 13:13
728x90
๋ฐ˜์‘ํ˜•

Branch

  • main
    • ์šด์˜ ํ™˜๊ฒฝ์˜ ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค.
    • merge์‹œ CI/CD์— ์˜ํ•ด ํ…Œ์ŠคํŠธ ์‹คํ–‰ ๋ฐ ์šด์˜ ํ™˜๊ฒฝ์— ๋ฐฐํฌ๋ฉ๋‹ˆ๋‹ค.
  • develop
    • ๊ฐœ๋ฐœ ํ™˜๊ฒฝ์˜ ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค.
    • main ๋ธŒ๋žœ์น˜๋กœ๋ถ€ํ„ฐ ์ƒ์„ฑ๋ฉ๋‹ˆ๋‹ค.
    • release์— mergeํ•ฉ๋‹ˆ๋‹ค.
    • merge์‹œ CI/CD์— ์˜ํ•ด ํ…Œ์ŠคํŠธ ์‹คํ–‰ ๋ฐ ๊ฐœ๋ฐœ ํ™˜๊ฒฝ์— ๋ฐฐํฌ๋ฉ๋‹ˆ๋‹ค.
  • release/**
    • ๋‹ค์Œ ์ถœ์‹œ๋ฅผ ์ค€๋น„ํ•  ๋•Œ ์ƒ์„ฑํ•˜๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค.
    • develop ๋ธŒ๋žœ์น˜๋กœ๋ถ€ํ„ฐ ์ƒ์„ฑ๋ฉ๋‹ˆ๋‹ค.
    • main, develop์— mergeํ•ฉ๋‹ˆ๋‹ค.
  • hotfix/**
    • ๊ธด๊ธ‰ ์ˆ˜์ • ์‚ฌํ•ญ์ด ์ƒ๊ฒผ์„ ๋•Œ ์‚ฌ์šฉํ•˜๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค.
    • main ๋ธŒ๋žœ์น˜๋กœ๋ถ€ํ„ฐ ์ƒ์„ฑ๋ฉ๋‹ˆ๋‹ค.
    • main, develop(๋˜๋Š” release)์— mergeํ•ฉ๋‹ˆ๋‹ค.
  • feature/**
    • ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€/๊ฐœ๋ฐœํ•  ๋•Œ ์‚ฌ์šฉ๋ฉ๋‹ˆ๋‹ค.
    • develop ๋ธŒ๋žœ์น˜๋กœ๋ถ€ํ„ฐ ์ƒ์„ฑ๋ฉ๋‹ˆ๋‹ค.
    • develop์— mergeํ•ฉ๋‹ˆ๋‹ค.

Commit

// ์ฃผ์ œ(๋ฒ”์œ„):๋‚ด์šฉ
feat(home-page):hot-topic section 
fix(my-page):validation bug

โ€ผ๏ธ  ํ•ด๋‹น ์Šคํฌ๋ฆฝํŠธ๋กœ ์ปค๋ฐ‹ ์ž‘์„ฑ์— ๋„์›€์„ ๋ฐ›์„ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค yarn run commit

์ฃผ์ œ ์ •ํ•˜๊ธฐ

  • feat: ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ, ํŽ˜์ด์ง€ ์ถ”๊ฐ€
  • fix: ๋ฒ„๊ทธ ์ˆ˜์ •
  • chore: ์ž์ž˜ํ•œ ์ˆ˜์ •
  • perf: ์„ฑ๋Šฅ ๊ฐœ์„ 
  • test: ํ…Œ์ŠคํŠธ ๊ด€๋ จ
  • docs: ๋ฌธ์„œ ๊ด€๋ จ ์ˆ˜์ •
  • refactor: ๋ฆฌํŒฉํ† ๋ง

๋ฒ”์œ„ ์ •ํ•˜๊ธฐ(Optional)

์ปค๋ฐ‹์„ ์ถ”์ ํ•  ๋•Œ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ผ์ผํžˆ ๋ณด์ง€ ์•Š๊ณ  ์šฐ์„ ์ ์œผ๋กœ ๋ฒ”์œ„๋ฅผ ๋ณด๋ฉฐ ์ถ”์ ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.

์ดํ›„ ๋‚ด์šฉ ์ž‘์„ฑ๋„ ๋”์šฑ ์‰ฌ์›Œ์ง€๊ณ  ๊ฐ„๊ฒฐํ•ด์ง‘๋‹ˆ๋‹ค.

๋‚ด์šฉ ์ •ํ•˜๊ธฐ

commit ๋ฉ”์‹œ์ง€๋ฅผ ํ†ตํ•ด ์ž‘์—…๋‚ด์šฉ์„ ๋Œ€๋žต์ ์œผ๋กœ ํŒŒ์•…ํ•˜๊ฒŒ ํ•ด์ฃผ์„ธ์š”

commit ๋ฉ”์‹œ์ง€ ์ž‘์„ฑ์ด ์–ด๋ ต๊ฒŒ ๋А๊ปด์ง„๋‹ค๋ฉด, ์ปค๋ฐ‹์˜ ๋ฒ”์œ„๊ฐ€ ๋„ˆ๋ฌด ํฌ์ง„ ์•Š์€์ง€ ๊ณ ๋ฏผํ•ด ๋ณด์„ธ์š”

 

 

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ์˜ˆ์‹œ

728x90
๋ฐ˜์‘ํ˜•

'๐Ÿ“š Study > DevOps' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€

SourceTree๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ Git ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ž‘์„ฑํ•  ๋•Œ ์ข‹์€ ๊ฐ€์ด๋“œ๋ผ์ธ  (0) 2023.08.26
๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์š”๊ตฌ ์‚ฌํ•ญ์— ๋”ฐ๋ผ AWS RDS๋ฅผ ์„ ํƒํ•ด์•ผ ํ•˜๋Š” ์ด์œ   (0) 2023.07.19
groom IDE๋กœ node๋ฐฐํฌ , DB mysql ๋ฐฐํฌํ•˜๊ธฐ  (0) 2023.06.25
Git Sourcetree๋กœ ์ปค๋ฐ‹ํ›„ push ํ•˜๋Š” ๋ฐฉ๋ฒ•  (0) 2023.06.13
Git Stash๋ž€ ๋ฌด์—‡์ธ๊ฐ€์š”?  (0) 2023.06.08
    '๐Ÿ“š Study/DevOps' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๋‹ค๋ฅธ ๊ธ€
    • SourceTree๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ Git ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ž‘์„ฑํ•  ๋•Œ ์ข‹์€ ๊ฐ€์ด๋“œ๋ผ์ธ
    • ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์š”๊ตฌ ์‚ฌํ•ญ์— ๋”ฐ๋ผ AWS RDS๋ฅผ ์„ ํƒํ•ด์•ผ ํ•˜๋Š” ์ด์œ 
    • groom IDE๋กœ node๋ฐฐํฌ , DB mysql ๋ฐฐํฌํ•˜๊ธฐ
    • Git Sourcetree๋กœ ์ปค๋ฐ‹ํ›„ push ํ•˜๋Š” ๋ฐฉ๋ฒ•
    kkh1902
    kkh1902
    1Day 1 Commit ๋ชฉํ‘œ ๊ณต๋ถ€ํ•œ๊ฒƒ๋“ค ๋งค์ผ ๊ธฐ๋กํ•˜๊ธฐ

    ํ‹ฐ์Šคํ† ๋ฆฌํˆด๋ฐ”