zhangchuanxi / saas-common-lib

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

git fetch origin
git checkout -b dev2.0 origin/dev2.0

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

git checkout master
git merge --no-ff dev2.0
git push origin master