Skip to content
Merged
Changes from all commits
Commits
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
30 changes: 16 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,18 @@ pnpm test # ํ…Œ์ŠคํŠธ ์‹คํ–‰

### 1. Branching Strategy

๊ธฐ๋Šฅ ๊ฐœ๋ฐœ์„ ์™„๋ฃŒํ–ˆ์œผ๋ฉด ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜๋กœ ํ‘ธ์‰ฌํ•˜๊ณ , PR์„ ํ†ตํ•ด Feature ๋ธŒ๋žœ์น˜๋“ค์„ develop์— ๋จธ์ง€ํ•˜๊ณ ,
develop์— ๋จธ์ง€๋œ ๊ธฐ๋Šฅ์ด ์ž˜ ์ž‘๋™ํ•˜๋Š”์ง€ ์ ๊ฒ€ํ•œ ์ดํ›„์— main ๋ธŒ๋žœ์น˜๋กœ ๋จธ์ง€ํ•˜์—ฌ ๋ฐฐํฌํ•˜๋Š” ๊ตฌ์กฐ๋ฅผ ๋”ฐ๋ฆ…๋‹ˆ๋‹ค.
๊ธฐ๋Šฅ ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋˜๋ฉด ํ•ด๋‹น Feature ๋ธŒ๋žœ์น˜๋ฅผ ์›๊ฒฉ ์ €์žฅ์†Œ์— ํ‘ธ์‰ฌํ•˜๊ณ ,
PR(Pull Request)์„ ํ†ตํ•ด `main` ๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉํ•ฉ๋‹ˆ๋‹ค.
๋ชจ๋“  ๊ฒ€์ฆ(CI ํ†ต๊ณผ, ์ฝ”๋“œ ๋ฆฌ๋ทฐ, ํ…Œ์ŠคํŠธ)์ด ์™„๋ฃŒ๋œ ์ดํ›„ `main`์— ๋จธ์ง€๋˜๋ฉด ์ž๋™์œผ๋กœ ๋ฐฐํฌ๊ฐ€ ์ง„ํ–‰๋ฉ๋‹ˆ๋‹ค.

### 2. ํ˜‘์—… ๊ณผ์ •

1. **Feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ๋ฐ ๊ฐœ๋ฐœ**
- ๋กœ์ปฌ์—์„œ `develop` ๋ธŒ๋žœ์น˜๋ฅผ ๊ธฐ์ค€์œผ๋กœ Feature ๋ธŒ๋žœ์น˜๋ฅผ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.
- ๋กœ์ปฌ์—์„œ `main` ๋ธŒ๋žœ์น˜๋ฅผ ๊ธฐ์ค€์œผ๋กœ Feature ๋ธŒ๋žœ์น˜๋ฅผ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.

```bash
git checkout main
git pull origin main
git checkout -b Feature/[๋ธŒ๋žœ์น˜๋ช…]
```

Expand Down Expand Up @@ -108,14 +111,9 @@ develop์— ๋จธ์ง€๋œ ๊ธฐ๋Šฅ์ด ์ž˜ ์ž‘๋™ํ•˜๋Š”์ง€ ์ ๊ฒ€ํ•œ ์ดํ›„์— main ๋ธŒ
<!-- ๊ด€๋ จ ์ด์Šˆ ๋ฒˆํ˜ธ๊ฐ€ ์žˆ๋‹ค๋ฉด ์ ์–ด์ฃผ์„ธ์š” (์˜ˆ: #123 ๋˜๋Š” JIRA ํ‚ค) -->
```

3. **Squash Merge**
- PR์„ ๋ณธ์ธ์ด ์ง์ ‘ **Squash Merge** ํ•ฉ๋‹ˆ๋‹ค.
- ๋จธ์ง€๋œ Feature ๋ธŒ๋žœ์น˜๋Š” ์ž๋™ ์‚ญ์ œ๋ฉ๋‹ˆ๋‹ค.

4. **develop ์ ๊ฒ€ โ†’ main ๋ฐฐํฌ (๋ฐฐํฌ ์ ๊ฒ€์šฉ)**
- `develop`์— ๋จธ์ง€๋œ ๊ธฐ๋Šฅ์ด ์ •์ƒ ๋™์ž‘ํ•˜๋Š”์ง€ ์ ๊ฒ€ํ•ฉ๋‹ˆ๋‹ค.
- ๋ฌธ์ œ๊ฐ€ ์—†๋‹ค๋ฉด `main` ๋ธŒ๋žœ์น˜๋กœ ๋จธ์ง€ํ•˜์—ฌ ๋ฐฐํฌํ•ฉ๋‹ˆ๋‹ค.
- ์ด๋•Œ PR์„ ์ƒ์„ฑํ•˜๊ณ  ์•„๋ž˜ ํ…œํ”Œ๋ฆฟ์„ ์ฑ„์›Œ์ฃผ์„ธ์š”.
3. **๊ธฐ๋Šฅ ์ ๊ฒ€**
- ํ…œํ”Œ๋ฆฟ์— ์ž‘์„ฑํ•œ ๋‚ด์šฉ์„ ๋ฐ”ํƒ•์œผ๋กœ ๋กœ์ปฌ ํ™˜๊ฒฝ์—์„œ **๊ธฐ๋Šฅ ํ…Œ์ŠคํŠธ**๋ฅผ ์ง„ํ–‰ํ•ฉ๋‹ˆ๋‹ค.
- **๊ธฐ๋Šฅ ํ…Œ์ŠคํŠธ**๊ฐ€ ๋๋‚œ ํ›„ ์•„๋ž˜ ํ…œํ”Œ๋ฆฟ์„ ์ด์–ด์„œ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.

```markdown
## ๐Ÿ› ๏ธ ์ตœ์ข… ๋ฐฐํฌ ์ ๊ฒ€ ๋ฆฌ์ŠคํŠธ
Expand All @@ -131,12 +129,16 @@ develop์— ๋จธ์ง€๋œ ๊ธฐ๋Šฅ์ด ์ž˜ ์ž‘๋™ํ•˜๋Š”์ง€ ์ ๊ฒ€ํ•œ ์ดํ›„์— main ๋ธŒ
<!-- ์ ๊ฒ€ ๊ฒฐ๊ณผ ๋ฐ ํŠน์ด์‚ฌํ•ญ์„ ์ ์–ด์ฃผ์„ธ์š” -->
```

4. **Squash Merge**
- PR ๋ฆฌ๋ทฐ ๋ฐ CI ํ†ต๊ณผ ํ›„, ๋ณธ์ธ์ด ์ง์ ‘ **Squash Merge** ํ•ฉ๋‹ˆ๋‹ค.
- ๋จธ์ง€๋œ Feature ๋ธŒ๋žœ์น˜๋Š” ์ž๋™์œผ๋กœ ์‚ญ์ œ๋ฉ๋‹ˆ๋‹ค.

5. **๋ฐฐํฌ ํ›„ ๋กœ์ปฌ ์ตœ์‹ ํ™” & ๋ธŒ๋žœ์น˜ ์ •๋ฆฌ**
- ๋ฐฐํฌ ์ ๊ฒ€์ด ์™„๋ฃŒ๋˜๋ฉด ๋กœ์ปฌ `develop`์„ ์ตœ์‹ ํ™”ํ•ฉ๋‹ˆ๋‹ค.
- `main` ๋จธ์ง€(๋ฐฐํฌ)๊ฐ€ ์™„๋ฃŒ๋˜๋ฉด ๋กœ์ปฌ ํ™˜๊ฒฝ์„ ์ตœ์‹ ํ™”ํ•ฉ๋‹ˆ๋‹ค.

```bash
git checkout develop
git pull origin develop
git checkout main
git pull origin main
```

- ์ดํ›„ ์ƒˆ๋กœ์šด ์ž‘์—…์„ ์œ„ํ•ด ๋ธŒ๋žœ์น˜๋ฅผ ๋ถ„๊ธฐํ•ฉ๋‹ˆ๋‹ค.
Expand Down