dev_sultan
master
# Conflicts: # lib/presentation/medical_file/medical_file_page.dart
# Conflicts: # lib/presentation/medical_file/medical_file_page.dart # lib/widgets/chip/app_custom_chip_widget.dart
# Conflicts: # lib/features/medical_file/medical_file_view_model.dart
# Conflicts: # lib/features/authentication/authentication_repo.dart # lib/features/authentication/authentication_view_model.dart # lib/features/medical_file/medical_file_view_model.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/61
# Conflicts: # lib/core/app_assets.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/62
# Conflicts: # lib/presentation/lab/lab_results/lab_result_details.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/63
# Conflicts: # lib/core/api/api_client.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/64
# Conflicts: # lib/extensions/string_extensions.dart # lib/presentation/my_family/widget/family_cards.dart # lib/widgets/chip/app_custom_chip_widget.dart # lib/widgets/common_bottom_sheet.dart
# Conflicts: # ios/Runner.xcodeproj/project.pbxproj # lib/presentation/medical_file/medical_file_page.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/66
# Conflicts: # lib/core/app_assets.dart # lib/widgets/input_widget.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/67
# Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/core/api/api_client.dart # lib/generated/locale_keys.g.dart # lib/presentation/lab/lab_results/lab_result_details.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/68
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/69
# Conflicts: # lib/presentation/book_appointment/select_clinic_page.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/70
# Conflicts: # assets/langs/ar-SA.json # lib/generated/locale_keys.g.dart # lib/presentation/lab/lab_orders_page.dart # lib/presentation/lab/lab_results/lab_result_details.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/71
# Conflicts: # lib/features/my_appointments/my_appointments_view_model.dart # lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart # lib/presentation/book_appointment/select_clinic_page.dart # lib/presentation/lab/lab_orders_page.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/72
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/73
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/74
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/75
# Conflicts: # lib/core/api/api_client.dart # lib/core/app_assets.dart # lib/features/medical_file/medical_file_repo.dart # lib/features/medical_file/medical_file_view_model.dart # lib/presentation/home/landing_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/presentation/profile_settings/profile_settings.dart # lib/widgets/chip/app_custom_chip_widget.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/76
# Conflicts: # lib/presentation/home/landing_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/widgets/chip/app_custom_chip_widget.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/77
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/80
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/78
# Conflicts: # lib/presentation/lab/lab_orders_page.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
# Conflicts: # lib/features/authentication/authentication_view_model.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/81
# Conflicts: # lib/presentation/lab/lab_orders_page.dart # lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/83
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/82
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/84
# Conflicts: # lib/core/dependencies.dart # lib/features/emergency_services/emergency_services_repo.dart # lib/features/emergency_services/emergency_services_view_model.dart # lib/presentation/emergency_services/emergency_services_page.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/85
# Conflicts: # lib/core/utils/utils.dart # lib/presentation/book_appointment/laser/widgets/body_part_listing.dart # lib/widgets/buttons/custom_button.dart # lib/widgets/common_bottom_sheet.dart # lib/widgets/input_widget.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/86
# Conflicts: # lib/extensions/string_extensions.dart # lib/widgets/buttons/custom_button.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/87
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
# Conflicts: # lib/core/utils/size_utils.dart # lib/presentation/home/widgets/large_service_card.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/89
# Conflicts: # lib/presentation/emergency_services/call_ambulance/tracking_screen.dart # lib/presentation/medical_file/medical_file_page.dart
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/90
# Conflicts: # lib/presentation/medical_file/medical_file_page.dart # lib/presentation/my_family/widget/family_cards.dart
Reviewed-on: #91
Reviewed-on: #92
Reviewed-on: #93
# Conflicts: # lib/core/api/api_client.dart # lib/core/dependencies.dart # lib/features/emergency_services/emergency_services_repo.dart # lib/features/emergency_services/emergency_services_view_model.dart # lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart # lib/main.dart # lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart # lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart # lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart # lib/presentation/emergency_services/emergency_services_page.dart # lib/widgets/input_widget.dart
# Conflicts: # lib/core/api/api_client.dart # lib/core/dependencies.dart # lib/main.dart # lib/presentation/appointments/appointment_payment_page.dart
Reviewed-on: #94
# Conflicts: # lib/core/dependencies.dart # lib/features/emergency_services/emergency_services_view_model.dart # lib/presentation/appointments/widgets/appointment_doctor_card.dart # lib/widgets/common_bottom_sheet.dart
Reviewed-on: #96
# Conflicts: # lib/presentation/emergency_services/call_ambulance/tracking_screen.dart # lib/presentation/profile_settings/profile_settings.dart # lib/presentation/radiology/radiology_orders_page.dart # lib/widgets/chip/app_custom_chip_widget.dart
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
Step 1:
From your project repository, check out a new branch and test the changes.Step 2:
Merge the changes and update on Gitea.