Tạo branch các nhân, resolve conflict trước khi merge vào main branch
git checkout -b <BRANCH-NAME>
-
git checkout main
-
git pull origin main
-
git checkout <YOUR-BRANCH-NAME>
-
git merge main
-
resolve your conflict
-
git push origin <YOUR-BRANCH-NAME>
-
Tạo pull request và merge vào main
assets
folder for image, iconlib
folder for handling app logictests
folder for testing
- lib/
- main.dart
- models/
- food_model.dart
- ingredient_model.dart
- nutrient_model.dart
- screens/
- home_screen.dart
- food_detail_screen.dart
- nutrient_detail_screen.dart
- widgets/
- custom_button.dart
- nutrient_card.dart
- services/
- api_service.dart
- database_service.dart
- utils/
- constants.dart
- theme/
- app_theme.dart
- routes.dart
- app.dart