git命令子分支合并到主分支

****Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "dev" "origin/dev"

Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "dev"  //强制把当前子分支"dev"合并到 主分支"master"上

Step 4. Push the result of the merge to GitLab

git push origin "master"