fatima_dev #6

Open
Fatimah wants to merge 2 commits from fatima_dev into faiz_development_common
Collaborator
There is no content yet.
Fatimah added 3 commits 3 months ago
Fatimah added 1 commit 3 months ago
Fatimah added 1 commit 1 month ago
b8625db7e4 Merge branch 'faiz_development_common' into fatima_dev
# Conflicts:
#	lib/view_models/requests_view_model.dart
#	lib/views/advertisement/components/ads_list_widget.dart
#	lib/views/requests/widget/request_item.dart
#	lib/widgets/common_widgets/filters_list.dart
#	pubspec.lock
Fatimah added 4 commits 4 weeks ago
fdfbd244ab Merge remote-tracking branch 'origin/master' into fatima_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
6188dc493e Merge branch 'master' into fatima_dev
# Conflicts:
#	lib/views/advertisement/components/ads_list_widget.dart
Fatimah added 3 commits 3 weeks ago
Fatimah added 1 commit 2 weeks ago
Fatimah added 2 commits 2 weeks ago
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
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 fatima_dev faiz_development_common
git pull origin fatima_dev

Step 2:

Merge the changes and update on Gitea.
git checkout faiz_development_common
git merge --no-ff fatima_dev
git push origin faiz_development_common
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
2 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/car_common_app#6
Loading…
There is no content yet.