Skip to content

๐Ÿ’ฌ Git ์ปจ๋ฒค์…˜

Seonghyeon Yang edited this page Nov 17, 2022 · 10 revisions

Tools

  • ๊ธฐ๋ณธ์ ์œผ๋กœ Android Studio์—์„œ ์ œ๊ณตํ•˜๋Š” Git/Github ์—ฐ๋™ ๊ธฐ๋Šฅ์„ ํ™œ์šฉํ•œ๋‹ค.

Commit

Message Convention

..
[prefix]: [์ž‘์—… ์„ค๋ช…]

#[์ด์Šˆ ๋ฒˆํ˜ธ]
..
# ์ž‘์—… ์„ค๋ช…์€ `ํ•œ๊ธ€`๋กœ
``
ex)
feat: ๊ธฐ๋Šฅ ๊ตฌํ˜„

#123

Message header

name description
init โ€ข ํŒŒ์ผ ์ƒ์„ฑ/ํ”„๋กœ์ ํŠธ ์ƒ์„ฑ
feat โ€ข ๊ธฐ๋Šฅ ๊ตฌํ˜„
fix โ€ข ๊ฒฐ๊ณผ์˜ ์ˆ˜์ •์ด ์žˆ์„ ๋•Œ
โ€ข ๋ฒ„๊ทธ๋ฅผ ํ•ด๊ฒฐํ–ˆ์„ ๋•Œ
refactor โ€ข ๋ฆฌํŒฉํ† ๋ง (==๊ฒฐ๊ณผ ๋ณ€๊ฒฝ ์—†์ด ์ฝ”๋“œ ์ˆ˜์ •)
test โ€ข ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ๊ด€๋ จ
style โ€ข ์ฝ”๋“œ ํฌ๋งทํŒ…(์˜คํƒ€ ์ˆ˜์ •, ๊ฐœํ–‰ ๋“ฑ ์ฝ”๋“œ ํ˜•ํƒœ ๋ณ€๊ฒฝ)
โ€ข ์ฃผ์„ ์ฒ˜๋ฆฌ ์ถ”๊ฐ€
build โ€ข ์˜์กด์„ฑ ๋ฐ ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์ถ”๊ฐ€
chore โ€ข ๊ทธ ์™ธ ๊ฐ„๋‹จํ•œ ์ถ”๊ฐ€
docs โ€ข ํ”„๋กœ์ ํŠธ ๋ฌธ์„œ ๊ด€๋ จ
design โ€ข ๋ ˆ์ด์•„์›ƒ UI ๊ตฌํ˜„ ๊ด€๋ จ(xml)
merge โ€ข merge์‹œ ์‚ฌ์šฉ

Subject Convention(์ž‘์—… ์„ค๋ช…)

  • ์ž‘์—… ๋‚ด์šฉ์„ ์ตœ๋Œ€ํ•œ ๊ฐ„๊ฒฐํ•˜๊ณ  ๋ช…์‚ฌํ˜•์œผ๋กœ ๋๋‚ธ๋‹ค.
     feat: ์•ฝ์† ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„
     refactor: ๋ฉ”์ธ ํ™”๋ฉด ๊ตฌ์กฐ ๋ณ€๊ฒฝ

Branch Strategy

Branch Usage

  • main - develop - feature ๋ธŒ๋žœ์น˜๋ฅผ ์‚ฌ์šฉ
  • Branch Convention
    • feature/add_promise
    • feature/edit_product
  • Issue

    #### Label
    [ ํ•ด๋‹น Issue์™€ ๊ด€๋ จ๋œ ๋ผ๋ฒจ๋งŒ ์ง€์ • ]
    
    #### ์ œ๋ชฉ
    [ ์ž‘์—… ๋‚ด์šฉ์„ ํ‘œํ˜„ํ•  ์ˆ˜ ์žˆ๋„๋ก ๋ช…์‹œ ]
    ex) ์•ฝ์† ๋ฆฌ์ŠคํŠธ ์ถœ๋ ฅ ๊ธฐ๋Šฅ ์ถ”๊ฐ€
    
    #### Description
    [ ์ถ”๊ฐ€์ ์ธ ์„ค๋ช…์„ ์ฒดํฌ๋ฆฌ์ŠคํŠธ๋กœ ์ž‘์„ฑ ]
    ex) - [ ] ListAdapter๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ ๋ฆฌ์‚ฌ์ดํด๋Ÿฌ๋ทฐ ์ถ”๊ฐ€
    

    Pull Request

    #### ์ œ๋ชฉ
    [ issue ์™€ ๋™์ผํ•˜๊ฒŒ ์ž‘์„ฑ ]
    
    #### Issue
    [ PR๊ณผ ๊ด€๋ จ๋œ Issue ]
    - ํ•ด๊ฒฐํ•œ issue -> Resolved: #2 
    - ํ•ด๊ฒฐ์ค‘์ธ issue -> Resolving: #13
    
    #### Changes
    [ PR ๋ณ€๊ฒฝ์‚ฌํ•ญ ์„ค๋ช… ]
    
    #### Screenshot (Optional)
    [ ๋ณ€๊ฒฝ๋œ ๋‚ด์šฉ๊ณผ ๊ด€๋ จ๋œ ์Šคํฌ๋ฆฐ์ƒท ]
    
    <!-- ์ถ”๊ฐ€์ ์ธ ์ž‘์„ฑ ์‚ฌํ•ญ์€ ์ž์œจ์ ์œผ๋กœ -->
    
    ex)
    ์ œ๋ชฉ:
    xxxx ๊ธฐ๋Šฅ ์ถ”๊ฐ€
    
    ๋‚ด์šฉ:
    Resolved: #2
    
    ## Changes
    xxxx ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ–ˆ๋‹ค.
    
    ## Screenshot
    [์‚ฌ์ง„]
    
    

    ๐ŸŒฑ Project

    ๐Ÿ“ Dev Story

    ๐Ÿค Ground Rule

    ๐Ÿ“‘ Convention

    โš™ Setting

    ๐Ÿ“† Daily Scrum

    ๐Ÿ’ก Weekly Review

    ๐Ÿ–ผ ๋ฐœํ‘œ ์ž๋ฃŒ

    Clone this wiki locally