We follow a feature branch workflow to maintain code quality and ensure proper review process.
feature/feature-name- New featuresbugfix/bug-description- Bug fixeshotfix/urgent-fix- Critical fixesdocs/documentation-update- Documentation changes
-
Create a feature branch
git checkout -b feature/your-feature-name
-
Make your changes
- Write clean, documented code
- Follow existing code style
- Add tests when appropriate
-
Commit your changes
git add . git commit -m "feat: descriptive commit message"
-
Push to remote
git push -u origin feature/your-feature-name
-
Create a Pull Request
- Provide clear description of changes
- Link related issues
- Request review from maintainers
-
Code Review
- Address feedback promptly
- Keep PR updated with latest changes
-
Merge
- Only merge after approval
- Use squash merge for clean history
- Delete feature branch after merge
We use conventional commits:
feat:- New featurefix:- Bug fixdocs:- Documentation changesstyle:- Code style changes (formatting, etc.)refactor:- Code refactoringtest:- Adding or updating testschore:- Maintenance tasks
Example:
feat: implement secure admin authentication with nextauth.js (#63)
- Direct pushes to main are disabled
- All changes must go through Pull Requests
- PRs require at least one review
- CI/CD must pass before merge
- Fork the repository
- Clone your fork
- Add upstream remote:
git remote add upstream https://github.com/devcarole/fluid.git
- Keep your fork updated:
git checkout main git pull upstream main
- Follow TypeScript best practices
- Use meaningful variable names
- Add JSDoc comments for complex functions
- Ensure no
console.login production code - Follow existing project structure
Thank you for contributing to Fluid! 🚀