Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Labels Milestones

some edits #2

Merged
sikandersaleem merged 3 commits from majd_development_new into main_latest_merged 2 years ago
Conversation 0 Commits 3 Files Changed 22
majdalattari commented 2 years ago
Collaborator
There is no content yet.
majdalattari added 1 commit 2 years ago
majdalattari added 2 commits 2 years ago
3737c3b41c Merge remote-tracking branch 'origin/main_latest_merged' into majd_development_new 
# Conflicts:
#	lib/views/pages/user/requests/report/edit_service_report.dart
#	lib/views/widgets/equipment/single_device_picker.dart
sikandersaleem merged commit 42808da16b into main_latest_merged 2 years ago
zaid.daoud referenced this issue from a commit 2 years ago
Merge With Majd [part #2]
The pull request has been merged as 42808da16b.
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 majd_development_new main_latest_merged
git pull origin majd_development_new

Step 2:

Merge the changes and update on Gitea.
git checkout main_latest_merged
git merge --no-ff majd_development_new
git push origin main_latest_merged
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/cloudsolutions-atoms#2
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'majd_development_new'

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

No
Yes