2024 벚꽃톤 6팀 REBOOK FrontEnd Repository입니다.
해당 Repository는 다음과 같은 규칙을 따르고 있습니다.
![](https://private-user-images.githubusercontent.com/62001944/313497206-44a7b097-9ff8-4bc4-a8e4-e3976b80ce5f.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNDgwNDEsIm5iZiI6MTczOTM0Nzc0MSwicGF0aCI6Ii82MjAwMTk0NC8zMTM0OTcyMDYtNDRhN2IwOTctOWZmOC00YmM0LWE4ZTQtZTM5NzZiODBjZTVmLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDA4MDkwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWFmZDcxNWYyOGUxNjc4MjgzNWQxNTMwODZkNTU2YTM0NjBlMTc3NzY5NTUwYzA2N2E3N2FlNDc2ZWQzYzAyZGImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.7_TulrHgIewnsc59DWGwIpPk9TXxNDr_t6OQcjUUZOk)
-
사용자는 먼저 Upstream Repository를 자신의 GitHub 계정으로 포크(fork)하고, 이 포크(fork)된 Origin Repository를 로컬 컴퓨터로 Clone하여 작업합니다.
-
그 후 개발한 변경 사항을 Origin Repository로 Push합니다. 이후 Upstream Repository로 풀 PR를 보내 변경 사항을 제안합니다.
-
PR이 완료 된 후 Upstream Repository의 최신 변경 사항을 가져오기 위해 Local에서 풀(pull)을 사용합니다.
![](https://private-user-images.githubusercontent.com/62001944/313497205-f858d497-3bf4-4198-80a7-c72acd4caba9.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNDgwNDEsIm5iZiI6MTczOTM0Nzc0MSwicGF0aCI6Ii82MjAwMTk0NC8zMTM0OTcyMDUtZjg1OGQ0OTctM2JmNC00MTk4LTgwYTctYzcyYWNkNGNhYmE5LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDA4MDkwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWQ3MGJmNzk0OGFiOTNmMmU5OTBlZjJjZDZjNjJiMmYxYjRlODc3YjIyNmIwOTBhMTY1MmZiYWZjNzRmMmI4YWYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.NtvUvWR-BlpWYIZ43K6NkgSwJ_nrDHqjD8ST0K_TXX8)
- 개발을 시작할 때는 Upstream Repository에서 Issue를 생성합니다.
- 이후 Issue에서 Origin Repository의 Dev Branch에서 새로운 Branch를 생성합니다
- 이때 브랜치 이름은 다음을 따릅니다.
- 새로운 기능 개발 : feature/#[Issue의 번호]
- 버그 픽스 : fix/#[Issue의 번호]
- 기능 리팩토링 : refactor/#[Issue의 번호]
- Loacl에서 Fetch를 통해 만든 New Branch(feature or fix or refactor)을 들고옵니다.
- 해당 Branch로 checkout 이후 기능 개발을 진행합니다.
![](https://private-user-images.githubusercontent.com/62001944/313497204-ab561acf-5d39-4f22-94b1-734b13565f52.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNDgwNDEsIm5iZiI6MTczOTM0Nzc0MSwicGF0aCI6Ii82MjAwMTk0NC8zMTM0OTcyMDQtYWI1NjFhY2YtNWQzOS00ZjIyLTk0YjEtNzM0YjEzNTY1ZjUyLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDA4MDkwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWY2NGM4MTIwN2M1Zjk1NDhjNTAzNjQ1Yzc0ZmEyZDhlM2Q4Mjk5YzM4ZWRmYjg3OWIxYWU4NDY0ZDQyMDQzYjAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.PX4HOpSF3jqEgmYPRK6gYgk25maGMRONa6-etGU6tMs)
- 기능 개발이 종료되면 Origin Repository의 Branch(feature or fix or refactor)로 변경 사항을 Push 합니다.
- Origin Repository에서 Upstream Repository로 PR을 보냅니다.
- Code Review 이후 마지막으로 Approve한 사람은 Squash And Merge를 합니다.
- PR이 Squash And Merge되면 Local에서는 dev Branch로 checkout합니다.
- Local에서 Upstream Repository의 dev Branch를 pull 받습니다.
- 마지막으로 Origin Repository의 dev Branch를 Update하기 위해 Push를 해줍니다.
![](https://private-user-images.githubusercontent.com/62001944/313497196-fb74b439-d8e2-4b56-9ebe-d6d33b682ab4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNDgwNDEsIm5iZiI6MTczOTM0Nzc0MSwicGF0aCI6Ii82MjAwMTk0NC8zMTM0OTcxOTYtZmI3NGI0MzktZDhlMi00YjU2LTllYmUtZDZkMzNiNjgyYWI0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDA4MDkwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTQyNDU5OGU1ZmFmZjJiYzZjZDRhOWFmOWY1YjAwMzgzZmY3MmQ0YzUwMDQ2Y2U0ZWM2MTdjODUzODgxMDk5YTcmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.JeB6gPN0zcB9xPH0popEstJWwbw43nPHBylvy4OX-Hc)
- 만약 Release Version을 낼 때는 Upstream의 dev Branch에서 main Branch로 PR을 날립니다.
- 해당 Repository의 모든 사용자가 Code를 재확인한 후 Merge를 합니다.
Commit Type | Description |
---|---|
feat | Add new features |
fix | Fix bugs |
docs | Modify documentation |
style | Code formatting, missing semicolons, no changes to the code itself |
refactor | Code refactoring |
test | Add test code, refactor test code |
chore | Modify package manager, and other miscellaneous changes (e.g., .gitignore) |
design | Change user UI design, such as CSS |
comment | Add or modify necessary comments |
rename | Only changes to file or folder names or locations |
remove | Only performing the action of deleting files |
Icon | Code | Description |
---|---|---|
🧑🏻🎨 | :art | Improve code structure/formatting |
⚡️ | :zap | Performance improvement |
🔥 | :fire | Delete code/files |
🐛 | :bug | Fix bugs |
🚑 | :ambulance | Urgent fixes |
✨ | :sparkles | Introduce new features |
💄 | :lipstick | Add/modify UI/style files |
⏪ | :rewind | Revert changes |
🔀 | :twisted_rightwards_arrows | Merge branches |
💡 | :bulb | Add/modify comments |
🗃 | :card_file_box | Database-related changes |