[git] git flow ์‚ฌ์šฉ๋ฒ• ๐Ÿฅ‘

๋ƒํ•ญยท2022๋…„ 1์›” 11์ผ
0

git

๋ชฉ๋ก ๋ณด๊ธฐ
3/3

1. git flow ์‹œ์ž‘ํ•˜๊ธฐ

git flow init 

2. ์ฃผ์˜์‚ฌํ•ญ

  • ์ปค๋ฐ‹ convention
  • username, email ๊นƒํ—ˆ๋ธŒ๋ž‘ ๋‹ค๋ฅด๋‹ค๋ฉด ๋‹ค๋ฅด๊ฒŒ ์„ค์ •!

3. git flow ์ฝ”๋“œ

(ํ”„๋กœ์ ํŠธ ํŒŒ์ผ์— ๋“ค์–ด์˜จ ์ƒํƒœ)
git init 

(readme ํŒŒ์ผ ์ถ”๊ฐ€ ํ›„ initial commit ํ•˜๊ธฐ)

git branch develop 
git switch develop 

echo "1.gifigf" > readme.md
git commit -am "c1"

echo "2.๋‘๋ฒˆ์งธ ๊ธฐ๋Šฅ" >> readme.md 
git commit -am "c2"

echo "3.์„ธ๋ฒˆ์งธ ๊ธฐ๋Šฅ" >> readme.md 
git commit -am "c3"



## c1์œผ๋กœ ๋Œ์•„๊ฐ€๊ธฐ
git checkout 264f --> commit id๋ฅผ 4๊ธ€์ž ๊นŒ์ง€ ์ž…๋ ฅ
echo "1.1 bugfix" >> readme.md
git commit -am "C1-b1"
git switch -c bugfix/1
git merge develop --> ์ถฉ๋Œ --> ํ•ด๊ฒฐํ•ด์กฐ~

git add .
git commit -m 'merge branch 'develop' into bugfix'

git switch develop

๋งŽ์ด ์—ฐ์Šตํ•ด๋ณด์ž!

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