๐™œ๐™ž๐™ฉ ๐™›๐™ก๐™ค๐™ฌ

uuuouuoยท2022๋…„ 4์›” 29์ผ
0

Git

๋ชฉ๋ก ๋ณด๊ธฐ
2/2
post-thumbnail

๐Ÿ“ Git flow ๊ด€๋ จ ๋ช…๋ น์–ด


โœ” ๊ธฐ์กด git ์ €์žฅ์†Œ ์ดˆ๊ธฐํ™”

  • ๋ช…๋ น์–ด ์‹คํ–‰ ํ›„ ์ž๋™์œผ๋กœ master ์™ธ develop branch ์ƒ์„ฑ
  • ๊ธฐ๋ณธ์ ์œผ๋กœ develop ์—์„œ ๊ฐœ๋ฐœ
  • ์„ค์ • ์ค‘ git devlelop <๋ธŒ๋žœ์น˜ ์ด๋ฆ„> ์ ์–ด์ฃผ๋ฉด ์ƒ์„ฑ

    git flow init

โœ” feature branch ์ƒ์„ฑ

  • develop ๋ฐ‘์— feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
  • feature/<๋ธŒ๋žœ์น˜์ด๋ฆ„>์œผ๋กœ ์ƒ์„ฑ ๋จ
  • ์ƒ์„ฑ ์ „ git pull origin <develop ๋ธŒ๋žœ์น˜> ํ•„์ˆ˜!

    git flow feature start <๋ธŒ๋žœ์น˜์ด๋ฆ„>

โœ” feature branch push

  • feature/<๋ธŒ๋žœ์น˜์ด๋ฆ„>๋กœ push
  • ํ•ด๋‹น ๋ช…๋ น์–ด ์‹คํ–‰ ์ „ git add . git commit -m "<๋ฉ”์„ธ์ง€๋‚ด์šฉ>" ํ›„ ์‹คํ–‰

    git flow feature publish <๋ธŒ๋žœ์น˜์ด๋ฆ„>

โœ” feature branch merge ๋ฐ ์‚ญ์ œ

  • develop์— feature ๋ธŒ๋žœ์น˜ merge
  • feature/<๋ธŒ๋žœ์น˜์ด๋ฆ„>์ด ์‚ญ์ œ ํ›„ merge
  • develop ๋ธŒ๋žœ์น˜์— ๋ณ€๊ฒฝ์ด ์žˆ๋‹ค๋ฉด, git pull origin <develop ๋ธŒ๋žœ์น˜>๋จผ์ €ํ•œ ํ›„ ํ•ด๋‹น ๋ช…๋ น์–ด ์‹คํ–‰
  • ๋ช…๋ น์–ด ์‹คํ–‰ ํ›„ develop ๋ธŒ๋žœ์น˜๋กœ ์ด๋™ ๋จ
  • ๋ช…๋ น์–ด ์‹คํ–‰ ํ›„ git push origin <develop ๋ธŒ๋žœ์น˜> ํ•„์ˆ˜!

    git flow feature finish <๋ธŒ๋žœ์น˜์ด๋ฆ„>

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