Step 1.
Update the repo and checkout the branch we are going to merge
git fetch origin
git checkout -b Shinner-approval-bug-fix origin/Shinner-approval-bug-fix
Step 2.
Merge the branch and push the changes to GitLab
git checkout master
git merge --no-ff Shinner-approval-bug-fix
git push origin master
