Owner: Dev Team | Last Updated: 2026-02-21 | Status: Current
Git process, branch conventions, and Pull Request rules.
| Property | Value |
|---|---|
| Primary | github.com/bikerentnyc/booking |
| Mirror | GitLab (for CI/CD) |
| Main Branch | main |
| Develop Branch | develop |
| Prefix | Purpose | Example |
|---|---|---|
feature/ |
New functionality | feature/gift-card-expiry |
bugfix/ |
Bug fix | bugfix/booking-cost-calc |
hotfix/ |
Urgent production fix | hotfix/stripe-webhook-fix |
refactor/ |
Refactoring | refactor/service-layer |
main (production)
├── develop (integration)
│ ├── feature/xxx
│ ├── bugfix/yyy
│ └── refactor/zzz
└── hotfix/urgent-fix (from main, merge back to main + develop)
<type>: <short description>
[optional body]
[optional footer]
| Type | When to Use |
|---|---|
feat |
New functionality |
fix |
Bug fix |
refactor |
Refactoring without behavior change |
docs |
Documentation |
style |
Formatting (spaces, commas) |
test |
Adding/modifying tests |
chore |
Auxiliary tasks (CI, deps) |
feat: add gift card expiration notification
fix: correct tax calculation for multi-experience bookings
refactor: extract pricing logic into DynamicPricingService
docs: add Channel Manager API documentation
Make sure the code meets standards:
./vendor/bin/pint # PHP formatting
npm run lint # JS/TS linting
npm run check-all-deps # Circular deps check
Run tests:
php artisan test
Update your branch with develop:
git fetch origin
git rebase origin/develop
## Description
[Brief description of changes]
## Type
- [ ] Feature
- [ ] Bug fix
- [ ] Refactoring
- [ ] Documentation
## Changes
- [List of changes]
## Testing
- [ ] Unit tests added/updated
- [ ] Feature tests added/updated
- [ ] Manual testing completed
## Screenshots (if UI changes)
[Screenshots]
The project is mirrored to GitLab for CI/CD:
Script: git_mirror_script.sh
| Date | Author | Change |
|---|---|---|
| 2026-02-21 | Documentation Team | Initial creation |
Prev: Testing Standards | Up: Contributing