合并分支

How to merge

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

git fetch origin
git checkout -b caofei origin/caofei

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

git checkout master
git merge --no-ff caofei
git push origin master