wxd / MShopWeApp

Step 1. Update the repo and checkout the branch we are going to merge

git fetch origin
git checkout -b dev origin/dev

Step 2. Merge the branch and push the changes to GitLab

git checkout test
git merge --no-ff dev
git push origin test