Resolve "Warranty upload fixes" #1440

Open
korina.cordero wants to merge 1 commit from 538-warranty-upload-fixes into master
korina.cordero commented 2021-02-26 06:16:31 +00:00 (Migrated from gitlab.com)

Closes #538

Closes #538
korina.cordero commented 2021-02-26 10:14:45 +00:00 (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>ba3b6c7d - Modify the response for warranty upload. #538</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/629/diffs?diff_id=149755833&start_sha=9f44148e1ae97ecf02d4d210c55433dbbc88c05f)
korina.cordero commented 2021-02-26 10:42:49 +00:00 (Migrated from gitlab.com)

marked this merge request as ready

marked this merge request as **ready**
This pull request has changes conflicting with the target branch.
  • src/Controller/WarrantyController.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 538-warranty-upload-fixes:538-warranty-upload-fixes
git checkout 538-warranty-upload-fixes

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 538-warranty-upload-fixes
git checkout 538-warranty-upload-fixes
git rebase master
git checkout master
git merge --ff-only 538-warranty-upload-fixes
git checkout 538-warranty-upload-fixes
git rebase master
git checkout master
git merge --no-ff 538-warranty-upload-fixes
git checkout master
git merge --squash 538-warranty-upload-fixes
git checkout master
git merge --ff-only 538-warranty-upload-fixes
git checkout master
git merge 538-warranty-upload-fixes
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
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#1440
No description provided.