Skip to content

๐ŸŒณ git ๋ธŒ๋žœ์น˜ ์ „๋žต

Taeeun Kim edited this page Jul 12, 2023 · 2 revisions

๋ธŒ๋žœ์น˜ ์—ญํ• 

๋ธŒ๋žœ์น˜ ์ด๋ฆ„ ๋ธŒ๋žœ์น˜ ์—ญํ•  ๋ธŒ๋žœ์น˜ ๊ทœ์น™
main ๋ฐฐํฌ ๋ธŒ๋žœ์น˜ ์ด ๋ธŒ๋žœ์น˜์— ์˜ฌ๋ผ์˜ค๋Š” ์ฝ”๋“œ๋Š” ์ •์ƒ ์ž‘๋™ํ•ด์•ผ ๋œ๋‹ค.
develop ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜ main ๋ธŒ๋žœ์น˜์—์„œ ํŒŒ์ƒ๋œ ๋ธŒ๋žœ์น˜. merge commit
feature ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜ develop ๋ธŒ๋žœ์น˜์—์„œ ํŒŒ์ƒ๋˜์–ด ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ์„ ํ•˜๋Š” ๋ธŒ๋žœ์น˜. squash merge
fix ๊ธฐ๋Šฅ ์ˆ˜์ • ๋ธŒ๋žœ์น˜ develop ๋ธŒ๋žœ์น˜์—์„œ ํŒŒ์ƒ๋˜์–ด ๊ธฐ๋Šฅ ์ˆ˜์ •์„ ํ•˜๋Š” ๋ธŒ๋žœ์น˜. squash merge
hotfix ๋ฒ„๊ทธ ์ˆ˜์ • ๋ธŒ๋žœ์น˜ main ๋ธŒ๋žœ์น˜์—์„œ ํŒŒ์ƒ๋˜์–ด ๊ธ‰ํ•œ ๋ฒ„๊ทธ๋ฅผ ๊ณ ์น˜๋Š” ๋ธŒ๋žœ์น˜

์ปค๋ฐ‹ ์ปจ๋ฒค์…˜

๋ธŒ๋žœ์น˜: feat/issue-#์ด์Šˆ๋ฒˆํ˜ธ | fix/issue-#์ด์Šˆ๋ฒˆํ˜ธ

//ex)
feat: ์–ด๋–ค ๊ธฐ๋Šฅ ์ถ”๊ฐ€

๋กค๋ฐฑ ๋Œ€์‘

main ๊ณผ develop ๋ธŒ๋žœ์น˜๊ฐ€ ์„œ๋กœ ์ปค๋ฐ‹ ์ด๋ ฅ์ด ๊ฐ™๊ฒŒ ์ตœ์‹ ํ™” ์œ ์ง€

๋กค๋ฐฑ ํ•„์š” ์‹œ

  1. ์•ˆ์ •ํ™” ๋œ ์ปค๋ฐ‹ ์ด๋ ฅ์œผ๋กœ ๋กค๋ฐฑ ํ›„ main ๋ฐฐํฌ
  2. develop ๋ธŒ๋žœ์น˜์—์„œ ์ด์Šˆ ๋Œ€์‘ ํ›„ ์žฌ๋ฐฐํฌ ํ›„ main ๋ฐฐํฌ

๊นƒ ์‹ค์Šต ๋ฏธ์…˜ ๋งํฌ

๐Ÿ” ๊ณตํ†ต

๐Ÿ”‘ ํ”„๋ก ํŠธ์—”๋“œ

๐Ÿ”’ ๋ฐฑ์—”๋“œ

๐Ÿ“ ํšŒ์˜๋ก

๐Ÿคฉ ๋ฐ๋ชจ๋ฐ์ด

Clone this wiki locally