From 40b28fd4efbf323267fd1a670f38c70f5b028374 Mon Sep 17 00:00:00 2001 From: codeisneverodd Date: Tue, 14 Jun 2022 16:28:58 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20PR=20=EC=96=91=EC=8B=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..08460e3 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,13 @@ +## 개요 + +[//]: # (요약) + +## 작업 내용 + +[//]: # (- 커밋 내용과 비슷 (커밋 딱지)) + +## 관련 이슈 + +[//]: # (FIX #이슈) + +## 참고 자료 From 9acaabbef2989a6f17d72d54f70e0e7aecfd262a Mon Sep 17 00:00:00 2001 From: codeisneverodd Date: Tue, 14 Jun 2022 16:29:08 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20?= =?UTF-8?q?=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index c321945..2a8d74a 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,8 @@ | fix | 버그 수정 | 제품 코드 수정 발생 | | docs | 문서 추가, 수정, 삭제 | 코드 수정 없음 | | etc | 그 외 모든 수정 | 유형이 혼재된 경우, 되도록이면 커밋 분리. 분리가 어려울 경우 위 순서 상 상위 항목의 유형으로 작성 | + +## 브랜치 컨벤션 +커밋 헤더-작업내용-본인이름 + +예시: feat-readmeConfig-codeisneverodd From a588e161ccb1527badcb29dc10baa6790fcaf15d Mon Sep 17 00:00:00 2001 From: codeisneverodd Date: Tue, 14 Jun 2022 16:34:12 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=EB=A8=B8=EC=A7=80=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 2a8d74a..dcb122a 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,14 @@ 커밋 헤더-작업내용-본인이름 예시: 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) From e9e2cc7be2bd538aaaed1eb75a8722999e4d4af1 Mon Sep 17 00:00:00 2001 From: codeisneverodd Date: Tue, 14 Jun 2022 16:35:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20PR=20prefix=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcb122a..f614dcf 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ 예시: feat-readmeConfig-codeisneverodd ## PR 컨벤션 -`[컴포넌트, 페이지, FIX, 디자인] 작업내용` +`[컴포넌트, 페이지, FIX, 디자인, 문서, 환경설정] 작업내용` 예시: `[컴포넌트, FIX] 푸터 기능 수정, 오타 수정`