Develop to QA Branch
Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b Develop origin/Develop
Step 2. Merge the branch and push the changes to GitLab
git checkout QA git merge --no-ff Develop git push origin QA
Changes were not merged into target branch
Conflicts: 400-SOURCECODE/AIAHTML5.Web/term-number-wp.js 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css