Skip to content

Latest commit

 

History

History
56 lines (39 loc) · 1.82 KB

conventions.md

File metadata and controls

56 lines (39 loc) · 1.82 KB

Project code guideline

Commit Rules

Commit Type Usage
feat add feature
fix bug fix
docs update documentation
style code formatting (ex: fix missing semicolon)
refactor code refactoring
test add test code
chore update/add package, extra update ex) .gitignore
design update UI design
rename rename file/folder
remove remove file/folder
!BREAKING breaking change of application API
!HOTFIX fix critical bug

Branch Rules

dev cycle

  1. Generate branch and checkout branch
git checkout -b {branch-type}/{main-category}/{sub-category}
  1. Start develope in the {branch-type}/{main-category}/{sub-category} branch
  • should follow commit rules
  • Commit should be split into as small functional units as possible
  1. Create Pull Request
  • Review your code quality with coworkers
  • Resolve branch conflict with main, if conflict ocurred ( locally / github conflict resolve )
  1. Merge branch into main

  2. Pull merged branch into your local machine

    1. change your branch to main
    git checkout main
    1. pull merged code into main
    git pull origin main
  3. Repeat cycle 1~5