Draft: Resolve "Manual Warranty Additions" #1479

Open
korina.cordero wants to merge 0 commits from 564-manual-warranty-additions into master-fix
korina.cordero commented 2021-05-19 03:11:34 +00:00 (Migrated from gitlab.com)

Closes #564

Closes #564
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 564-manual-warranty-additions:564-manual-warranty-additions
git checkout 564-manual-warranty-additions

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-fix
git merge --no-ff 564-manual-warranty-additions
git checkout 564-manual-warranty-additions
git rebase master-fix
git checkout master-fix
git merge --ff-only 564-manual-warranty-additions
git checkout 564-manual-warranty-additions
git rebase master-fix
git checkout master-fix
git merge --no-ff 564-manual-warranty-additions
git checkout master-fix
git merge --squash 564-manual-warranty-additions
git checkout master-fix
git merge --ff-only 564-manual-warranty-additions
git checkout master-fix
git merge 564-manual-warranty-additions
git push origin master-fix
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#1479
No description provided.