Skip to content

[문서] PR 템플릿 추가, 브랜치, PR, Merge 컨벤션 추가 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaerin-dev merged 4 commits into from
Jun 14, 2022
Merged

[문서] PR 템플릿 추가, 브랜치, PR, Merge 컨벤션 추가 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40b28fd
feat: PR 양식 추가
codeisneverodd Jun 14, 2022
9acaabb
feat: 브랜치 컨벤션 추가
codeisneverodd Jun 14, 2022
a588e16
feat: 머지 컨벤션 추가
codeisneverodd Jun 14, 2022
e9e2cc7
feat: PR prefix 추가
codeisneverodd Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## 개요

[//]: # (요약)

## 작업 내용

[//]: # (- 커밋 내용과 비슷 (커밋 딱지))

## 관련 이슈

[//]: # (FIX #이슈)

## 참고 자료
16 changes: 16 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,19 @@
| fix | 버그 수정 | 제품 코드 수정 발생 |
| docs | 문서 추가, 수정, 삭제 | 코드 수정 없음 |
| etc | 그 외 모든 수정 | 유형이 혼재된 경우, 되도록이면 커밋 분리. 분리가 어려울 경우 위 순서 상 상위 항목의 유형으로 작성 |

## 브랜치 컨벤션
커밋 헤더-작업내용-본인이름

예시: feat-readmeConfig-codeisneverodd

## PR 컨벤션
`[컴포넌트, 페이지, FIX, 디자인, 문서, 환경설정] 작업내용`

예시: `[컴포넌트, FIX] 푸터 기능 수정, 오타 수정`

## Merge 규칙
Squash Merge 로 통일, Merge 타이틀은 PR 과 동일하게 유지

![image-20220614163254981](https://tva1.sinaimg.cn/large/e6c9d24egy1h37t57t287j20ua0623z4.jpg)
![image-20220614163318481](https://tva1.sinaimg.cn/large/e6c9d24egy1h37t5kuv5sj20su0dudh4.jpg)