Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b feature/cart origin/feature/cart
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout release/5.4.1 git merge --no-ff feature/cart
Step 4. Push the result of the merge to GitLab
git push origin release/5.4.1
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines
The changes were merged into release/5.4.1. The source branch has been removed.
Status changed to merged
try { | ||
orderInfo = JSON.parse(req.cookies['order-info']); | ||
} catch (e) { | ||
logger.info(`orderEnsure: get orderInfo from cookie error:${JSON.stringify(e)}`); | ||
|