@@ -182,6 +182,19 @@ const BASE_URL = "https://api.stateinfra.kr"
182182
183183## Branch Strategy
184184
185+ ```
186+ main ← develop ← feat/<name>
187+ ← fix/<name>
188+ ← test/<name>
189+ ← chore/<name>
190+ ← ...
191+ ```
192+
193+ - All feature branches must be created from ` develop `
194+ - Feature branches merge into ` develop ` via PR
195+ - ` develop ` merges into ` main ` via PR (release)
196+ - ** Direct commits or pushes to ` main ` or ` develop ` are strictly forbidden**
197+
185198| Branch | Purpose |
186199| --------| ---------|
187200| ` main ` | Production deployment |
@@ -190,6 +203,9 @@ const BASE_URL = "https://api.stateinfra.kr"
190203| ` fix/<name> ` | Bug fix |
191204| ` test/<name> ` | Test code |
192205| ` chore/<name> ` | Config, dependencies |
206+ | ` refactor/<name> ` | Code improvement |
207+ | ` design/<name> ` | UI design change |
208+ | ` docs/<name> ` | Documentation |
193209
194210## Git Conventions
195211
@@ -231,6 +247,9 @@ const BASE_URL = "https://api.stateinfra.kr"
231247
232248| Command | Description |
233249| ---------| -------------|
250+ | ` /create-branch <type>/<name> ` | Create a new branch from develop |
251+ | ` /create-component <Name> ` | Create a component in the correct FSD layer |
252+ | ` /create-page <route> ` | Create an App Router page with loading/error |
234253| ` /write-test <file> ` | Write unit tests for the specified file |
235254| ` /commit ` | Analyze changes and create a commit |
236255| ` /pr ` | Draft and create a pull request |
0 commit comments