Software Público Brasileiro

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

git fetch origin
git checkout -b layout-fix origin/layout-fix

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

git checkout spb-release/3.0
git merge --no-ff layout-fix
git push origin spb-release/3.0