Software Público Brasileiro

Step 1. Update the repo and checkout the branch we are going to merge

git fetch origin
git checkout -b content-manager-hostspot origin/content-manager-hostspot

Step 2. Merge the branch and push the changes to GitLab

git checkout master_rails3
git merge --no-ff content-manager-hostspot
git push origin master_rails3