Step 1.
Update the repo and checkout the branch we are going to merge
git fetch origin
git checkout -b 25035 origin/25035
Step 2.
Merge the branch and push the changes to GitLab
git checkout Develop-IPAD-MAC
git merge --no-ff 25035
git push origin Develop-IPAD-MAC
