Gitflow: ๋ฒ„์ „์„ ๋ฒ”ํ”„ํ•˜๋Š” ๋ฐฉ๋ฒ•?

์— ๋งŒ๋“  2010๋…„ 04์›” 27์ผ  ยท  4์ฝ”๋ฉ˜ํŠธ  ยท  ์ถœ์ฒ˜: nvie/gitflow

๋ฆด๋ฆฌ์Šค ๋ถ„๊ธฐ๋ฅผ ์‹œ์ž‘ํ•  ๋•Œ:

$git flow release start release-1.1 1fe0166
Switched to a new branch 'release/release-1.1'

Summary of actions:
 - A new branch 'release/release-1.1' was created, based on '1fe0166'
 - You are now on branch 'release/release-1.1'

 Follow-up actions:
 - Bump the version number now!
 - Start committing last-minute fixes in preparing your release
 - When done, run:

      git flow release finish 'release-1.1'

๋‚˜๋Š” ํ›„์† ์กฐ์น˜๋ฅผ ์ทจํ•˜๊ณ  ๋ฒ„์ „ nmber๋ฅผ ๋ฒ”ํ”„ํ•˜๊ณ  ์‹ถ์Šต๋‹ˆ๋‹ค. ํ•˜์ง€๋งŒ ์™œ ๊ทธ๋ฆฌ๊ณ  ์–ด๋–ป๊ฒŒ? ์™„๋ฃŒํ•˜๋ฉด ์ž๋™์œผ๋กœ ์™„๋ฃŒ๋ฉ๋‹ˆ๊นŒ?

๊ฐ€์žฅ ์œ ์šฉํ•œ ๋Œ“๊ธ€

๋ฒ”ํ•‘์€ ๋ฒ„์ „ ๋ฒˆํ˜ธ๋ฅผ ๋†’์ด๋Š” ํ–‰์œ„๋ฅผ ๋งํ•ฉ๋‹ˆ๋‹ค. ๋ถ„๊ธฐ์— ๊ด€ํ•œ ํ•œ gitflow๋Š” ์ž๋™์œผ๋กœ ์ด๋ฅผ ์ˆ˜ํ–‰ํ•ฉ๋‹ˆ๋‹ค. ๊ทธ๋Ÿฌ๋‚˜ ์‘์šฉ ํ”„๋กœ๊ทธ๋žจ(๋˜๋Š” ๋ฒ„์ „ ๊ด€๋ฆฌ ๋Œ€์ƒ)์€ ํ˜„์žฌ ๋ฒ„์ „์ด ๋ฌด์—‡์ธ์ง€ ์•Œ๊ณ  ์‹ถ์–ดํ•  ๊ฒƒ์ž…๋‹ˆ๋‹ค. ๋ฌผ๋ก  ์ˆ˜๋™์œผ๋กœ ์ˆ˜ํ–‰ํ•ด์•ผ ํ•˜๋Š” ์ž‘์—…์ž…๋‹ˆ๋‹ค.

gitflow๊ฐ€ "์ง€๊ธˆ ๋ฒ„์ „ ๋ฒˆํ˜ธ๋ฅผ ๋ณ€๊ฒฝํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค"๋ผ๊ณ  ๋ณด๊ณ ํ•˜๋ฉด ์ด๋Š” ์˜ฌ๋ฐ”๋ฅธ ๋ฒ„์ „ ๋ฒˆํ˜ธ๋ฅผ ๋ฐ˜์˜ํ•˜๋„๋ก ํŒŒ์ผ์„ ์ˆ˜๋™์œผ๋กœ ์—…๋ฐ์ดํŠธํ•œ๋‹ค๋Š” ์˜๋ฏธ์ž…๋‹ˆ๋‹ค.

๋ชจ๋“  4 ๋Œ“๊ธ€

๋ฒ”ํ•‘์€ ๋ฒ„์ „ ๋ฒˆํ˜ธ๋ฅผ ๋†’์ด๋Š” ํ–‰์œ„๋ฅผ ๋งํ•ฉ๋‹ˆ๋‹ค. ๋ถ„๊ธฐ์— ๊ด€ํ•œ ํ•œ gitflow๋Š” ์ž๋™์œผ๋กœ ์ด๋ฅผ ์ˆ˜ํ–‰ํ•ฉ๋‹ˆ๋‹ค. ๊ทธ๋Ÿฌ๋‚˜ ์‘์šฉ ํ”„๋กœ๊ทธ๋žจ(๋˜๋Š” ๋ฒ„์ „ ๊ด€๋ฆฌ ๋Œ€์ƒ)์€ ํ˜„์žฌ ๋ฒ„์ „์ด ๋ฌด์—‡์ธ์ง€ ์•Œ๊ณ  ์‹ถ์–ดํ•  ๊ฒƒ์ž…๋‹ˆ๋‹ค. ๋ฌผ๋ก  ์ˆ˜๋™์œผ๋กœ ์ˆ˜ํ–‰ํ•ด์•ผ ํ•˜๋Š” ์ž‘์—…์ž…๋‹ˆ๋‹ค.

gitflow๊ฐ€ "์ง€๊ธˆ ๋ฒ„์ „ ๋ฒˆํ˜ธ๋ฅผ ๋ณ€๊ฒฝํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค"๋ผ๊ณ  ๋ณด๊ณ ํ•˜๋ฉด ์ด๋Š” ์˜ฌ๋ฐ”๋ฅธ ๋ฒ„์ „ ๋ฒˆํ˜ธ๋ฅผ ๋ฐ˜์˜ํ•˜๋„๋ก ํŒŒ์ผ์„ ์ˆ˜๋™์œผ๋กœ ์—…๋ฐ์ดํŠธํ•œ๋‹ค๋Š” ์˜๋ฏธ์ž…๋‹ˆ๋‹ค.

๊ทธ๋Š” ๋นˆ์„ผํŠธ,
๋น ๋ฅธ ๋‹ต๋ณ€์„ ์œ„ํ•ด Dank je wel.
์Šคํฌ๋ฆฝํŠธ๋Š” ํ›Œ๋ฅญํ•˜๊ฒŒ ์ž‘๋™ํ•ฉ๋‹ˆ๋‹ค. ๋ฆด๋ฆฌ์Šค ๋ถ„๊ธฐ ๋“ฑ์ด ๋ฆฌ๋ชจ์ปจ๊ณผ ์–ด๋–ป๊ฒŒ ์ž‘๋™ํ•˜๋Š”์ง€ ์•„์ง ํ™•์‹คํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ๋‚˜๋Š” ๊ทธ๊ฒƒ์ด ์—ฌ์ „ํžˆ ๊ธฐ๋ณธ์ ์ธ git์ด๋ผ๊ณ  ์ƒ๊ฐํ•ฉ๋‹ˆ๋‹ค.
๋…ธ๊ทธ๋ง ๊ฐ์‚ฌํ•ฉ๋‹ˆ๋‹ค!

  • ๋ฐฑ์ธ

์•ˆ๋…•ํ•˜์„ธ์š”

์ €๋Š” _Git_์„ ์ฒ˜์Œ ์ ‘ํ–ˆ๋Š”๋ฐ ํŒŒ์ผ์„ ์ˆ˜๋™์œผ๋กœ ์—…๋ฐ์ดํŠธํ•œ๋‹ค๋Š” ๊ฒƒ์ด ๋ฌด์—‡์„ ์˜๋ฏธํ•˜๋Š”์ง€ ์ดํ•ดํ•˜์ง€ ๋ชปํ–ˆ์Šต๋‹ˆ๋‹ค. ๊ทธ๊ฒƒ์— ๋Œ€ํ•œ ๋ช…๋ น์ด ์žˆ์Šต๋‹ˆ๊นŒ ์•„๋‹ˆ๋ฉด ๋‹ค์‹œ ์ปค๋ฐ‹ํ•œ๋‹ค๋Š” ์˜๋ฏธ์ž…๋‹ˆ๊นŒ?
๋ฏธ๋ฆฌ ๊ฐ์‚ฌ๋“œ๋ฆฝ๋‹ˆ๋‹ค.

@Dmaster420 no nvie๋Š” ์‹ค์ œ๋กœ ์ฝ”๋“œ ๊ธฐ๋ฐ˜์—์„œ ๋ฒ„์ „์„ ์„ค๋ช…ํ•˜๊ณ  ์ง์ ‘ ์ฆ๊ฐ€์‹œํ‚ฌ ์ˆ˜ ์žˆ๋Š” ์œ„์น˜๋ฅผ ์ฐพ๋Š” ๊ฒƒ์„ ์˜๋ฏธํ•ฉ๋‹ˆ๋‹ค.

์˜ˆ๋ฅผ ๋“ค์–ด, ๋‚ด django ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ๋‚ด์—์„œ ์ผ๋ฐ˜์ ์œผ๋กœ ๊ธฐ๋ณธ init .py ํŒŒ์ผ์— ๋ฒ„์ „์„ ์ €์žฅํ•ฉ๋‹ˆ๋‹ค.

https://github.com/airtonix/django-ikari/blob/master/ikari/__init__.py

๊ทธ๋Ÿฐ ๋‹ค์Œ setup.py์—์„œ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.

https://github.com/airtonix/django-ikari/blob/master/setup.py#L8

์ œ ๊ฒฝ์šฐ์—๋Š” nvie๊ฐ€ " init .py๋ฅผ ํŽธ์ง‘ํ•˜๊ณ  '0.0.8'์—์„œ '0.0.9'(๋˜๋Š” ๋ฆด๋ฆฌ์Šค ๋ฒ„์ „์ด ๋ฌด์—‡์ด๋“ )๋กœ ๋ณ€๊ฒฝํ•ฉ๋‹ˆ๋‹ค.

๊ทธ๋Ÿฌ๋‚˜ ์ด๊ฒƒ์„ ์ž๋™ํ™”ํ•  ์ˆ˜ ์žˆ๋Š” ํ›„ํฌ๋ฅผ ์ œ๊ณตํ•˜๋Š” ๋ถ„๊ธฐ๋œ ๋ฒ„์ „์˜ git-flow๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค.

์ด ํŽ˜์ด์ง€๊ฐ€ ๋„์›€์ด ๋˜์—ˆ๋‚˜์š”?
0 / 5 - 0 ๋“ฑ๊ธ‰