Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b fix_settings origin/fix_settings
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff fix_settings git push origin master
mentioned in commit 5a46a3dde80c64dee416f61b20f5dbbcf3e8eff8