Software Público Brasileiro

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

git fetch origin
git checkout -b edit-blocks origin/edit-blocks

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

git checkout master
git merge --no-ff edit-blocks
git push origin master