Software Público Brasileiro

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

git fetch origin
git checkout -b create_var_lock_dir origin/create_var_lock_dir

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

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