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 |
- Generate branch and checkout branch
git checkout -b {branch-type}/{main-category}/{sub-category}
- 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
- Create Pull Request
- Review your code quality with coworkers
- Resolve branch conflict with
main
, if conflict ocurred ( locally / github conflict resolve )
-
Merge branch into
main
-
Pull merged branch into your local machine
- change your branch to
main
git checkout main
- pull merged code into
main
git pull origin main
- change your branch to
-
Repeat cycle
1~5