Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Labels Milestones

dev_aamir #76

Merged
Haroon6138 merged 24 commits from dev_aamir into master 3 weeks ago
Conversation 0 Commits 24 Files Changed 38
aamir.muhammad commented 3 weeks ago
Collaborator

family files

family files
aamir.muhammad added 24 commits 3 weeks ago
e5f4da4e16 Merge branch 'master' into dev_aamir 
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
d5bd99f525 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1b652f877d Merge branch 'master' into dev_aamir 
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir 
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
e5488299b8 Merge branch 'master' into dev_aamir 
# 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
aaa8222b1a Merge branch 'master' into dev_aamir 
# 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
Haroon6138 merged commit 215f3f3335 into master 3 weeks ago
The pull request has been merged as 215f3f3335.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b dev_aamir master
git pull origin dev_aamir

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff dev_aamir
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
No items
No Label
Milestone
Set milestone
Clear milestone
No items
No Milestone
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Haroon6138/HMG_Patient_App_New#76
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'dev_aamir'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes