Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b Develop-IPAD-MAC origin/Develop-IPAD-MAC
Step 2. Merge the branch and push the changes to GitLab
git checkout PreQA git merge --no-ff Develop-IPAD-MAC git push origin PreQA
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html