Code Merge Workflow
1. Create Feature Branch¶
Create branch from dev branch.
Naming:
feature/<feature-name>
Example:
feature/course-progress
2. Implement Feature¶
Write code, test locally, commit changes.
Commit:
git commit -m "feat: add progress tracking"
3. Push to GitHub¶
git push origin feature/<feature-name>
4. Create Pull Request¶
PR from feature/<feature-name> → dev
5. Code Review¶
Review for security, quality, performance.
6. Approval & Merge¶
Merge to dev after approval.
7. Production Release¶
PR dev → main
8. Deployment¶
- Frontend: Vercel
- Backend: AWS EC2