Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Labels Milestones

sultan-dev #17

Open
khansultan1 wants to merge 64 commits from sultan-dev into master
pull from: sultan-dev
merge into: Haroon6138:master
Conversation 0 Commits 64 Files Changed 48
khansultan1 commented 2 years ago
Collaborator
There is no content yet.
khansultan1 added 64 commits 2 years ago
5a338199b9 Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/ui/login/login_screen.dart
7af10ec337 Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
9dd4456c51 Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/ui/landing/itg/its_add_screen_video_image.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
01939abc2f Merge remote-tracking branch 'origin/development_aamir' into development_aamir 
# Conflicts:
#	lib/classes/chat_call_kit.dart
#	lib/classes/consts.dart
2e05bea49d Merge remote-tracking branch 'origin/development_aamir' into development_aamir 
# Conflicts:
#	lib/classes/chat_call_kit.dart
#	lib/classes/notifications.dart
fb63963905 Merge branch 'aamir_dev' into development_aamir_testing 
# Conflicts:
#	lib/api/chat/chat_api_client.dart
#	lib/classes/chat_call_kit.dart
#	lib/main.dart
#	lib/provider/chat_call_provider.dart
#	lib/ui/chat/call/chat_incoming_call_screen.dart
#	lib/ui/chat/chat_detailed_screen.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
f21348d9b7 Merge branch 'development_haroon_merge_aamir' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 
# Conflicts:
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/api/chat/chat_api_client.dart
#	lib/classes/consts.dart
#	lib/generated_plugin_registrant.dart
#	lib/main.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
This pull request has changes conflicting with the target branch.
  • android/app/src/main/kotlin/com/mohem_flutter_app/MainActivity.kt
  • android/gradle/wrapper/gradle-wrapper.properties
  • ios/Runner.xcodeproj/project.pbxproj
  • ios/Runner/AppDelegate.swift
  • lib/api/chat/chat_api_client.dart
  • lib/classes/consts.dart
  • lib/generated_plugin_registrant.dart
  • lib/main.dart
  • lib/provider/chat_provider_model.dart
  • lib/theme/app_theme.dart
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 sultan-dev master
git pull origin sultan-dev

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff sultan-dev
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/mohemm-flutter-app#17
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'sultan-dev'

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

No
Yes