rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

WIP: Resolve "Warranties with no plate number set to commercial" #1136

Draft
korina.cordero wants to merge 2 commits from 279-warranties-with-no-plate-number-set-to-commercial into master
pull from: 279-warranties-with-no-plate-number-set-to-commercial
merge into: rgutierrez:master
Conversation 1 Commits 2 Files changed 1 +64
korina.cordero commented 2019-11-25 06:01:20 +00:00 (Migrated from gitlab.com)
Copy link

Closes #279

Closes #279
korina.cordero commented 2019-11-25 07:00:23 +00:00 (Migrated from gitlab.com)
Copy link

added 4 commits

  • 3babcd76...0c5a4c40 - 2 commits from branch master
  • 44658116 - Add command to set warranty class to commercial for warranties with no plate numbers. #279
  • 4ddb3736 - Merge branch 'master' of gitlab.com:jankstudio/resq into...

Compare with previous version

added 4 commits <ul><li>3babcd76...0c5a4c40 - 2 commits from branch <code>master</code></li><li>44658116 - Add command to set warranty class to commercial for warranties with no plate numbers. #279</li><li>4ddb3736 - Merge branch &#39;master&#39; of gitlab.com:jankstudio/resq into...</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/325/diffs?diff_id=64442380&start_sha=3babcd765f80171299a3bee5a5fd27d091d84473)
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 279-warranties-with-no-plate-number-set-to-commercial:279-warranties-with-no-plate-number-set-to-commercial
git checkout 279-warranties-with-no-plate-number-set-to-commercial

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff 279-warranties-with-no-plate-number-set-to-commercial
git checkout 279-warranties-with-no-plate-number-set-to-commercial
git rebase master
git checkout master
git merge --ff-only 279-warranties-with-no-plate-number-set-to-commercial
git checkout 279-warranties-with-no-plate-number-set-to-commercial
git rebase master
git checkout master
git merge --no-ff 279-warranties-with-no-plate-number-set-to-commercial
git checkout master
git merge --squash 279-warranties-with-no-plate-number-set-to-commercial
git checkout master
git merge --ff-only 279-warranties-with-no-plate-number-set-to-commercial
git checkout master
git merge 279-warranties-with-no-plate-number-set-to-commercial
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: rgutierrez/resq#1136
No description provided.
Delete branch "279-warranties-with-no-plate-number-set-to-commercial"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?