Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b qa origin/qa
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff qa git push origin master
Status changed to merged
mentioned in commit 82692bc89b3cd91dd3db12a0caabbb3f555a637a
Test See merge request !564
Dev See merge request !563
2. 再进入购物车的时候，要把赠品清理掉 3. 在选择的时候也要先清理赠品
