Skip to content

05. Git Branch Style Guide

Joylish edited this page Oct 18, 2020 · 1 revision

bbzzkk Git Branch Style Guide

bbzzkkํŒ€์ด ์ง€ํ–ฅํ•˜๋Š” Git Branch ์Šคํƒ€์ผ ๊ฐ€์ด๋“œ์ž…๋‹ˆ๋‹ค.

Structure

Branch๋Š” ํฌ๊ฒŒ ๋‹ค์Œ์˜ ํ˜•ํƒœ๋กœ ์ž‘์„ฑํ•œ๋‹ค.

master : ์ œํ’ˆ์œผ๋กœ ์ถœ์‹œ๋  ์ˆ˜ ์žˆ๋Š” ๋ธŒ๋žœ์น˜
develop : ๋‹ค์Œ ์ถœ์‹œ ๋ฒ„์ „์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
feature : ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
release : ์ด๋ฒˆ ์ถœ์‹œ ๋ฒ„์ „์„ ์ค€๋น„ํ•˜๋Š” ๋ธŒ๋žœ์น˜
hotfix : ์ถœ์‹œ ๋ฒ„์ „์—์„œ ๋ฐœ์ƒํ•œ ๋ฒ„๊ทธ๋ฅผ ์ˆ˜์ • ํ•˜๋Š” ๋ธŒ๋žœ์น˜

1. ์ƒ์„ธ ๊ทœ์น™

  • develop ๋ธŒ๋žœ์น˜๋Š” ํ•˜๋‚˜๋กœ ํ•œ๋‹ค.

    ๋ชจ๋“ˆ ํ”„๋กœ์ ํŠธ (์†Œ์…œ๋กœ๊ทธ์ธ) ๊ฐœ๋ฐœ ๊ธฐ๊ฐ„์—๋Š” develop ๋ธŒ๋žœ์น˜๋ฅผ develop_front ๋ธŒ๋žœ์น˜์™€ develop_back ๋ธŒ๋žœ์น˜๋กœ ๋‚˜๋ˆ„์—ˆ๋‹ค. ํ•˜์ง€๋งŒ ์•ž์œผ๋กœ์˜ ๊ฐœ๋ฐœ ๊ธฐ๊ฐ„๋™์•ˆ์—๋Š” develop ๋ธŒ๋žœ์น˜ ํ•˜๋‚˜๋กœ๋งŒ ์“ธ ์˜ˆ์ •์ด๋‹ค.

  • feature ๋ธŒ๋žœ์น˜๋Š” develop ๋ธŒ๋žœ์น˜์—์„œ ํŒŒ์ƒ๋˜๋ฉฐ, frontend์™€ backend ๊ตฌ๋ถ„ํ•œ๋‹ค.

    feature-[๊ธฐ๋Šฅ์ด๋ฆ„]-[FE ๋˜๋Š” BE]
    
  • hotfix ๋ธŒ๋žœ์น˜๋Š” master ๋ธŒ๋žœ์น˜์—์„œ ํŒŒ์ƒ๋œ๋‹ค.

    hotfix-[github bug ์ด์Šˆ๋ฒˆํ˜ธ]
    
Clone this wiki locally