Software Público Brasileiro

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

git fetch origin
git checkout -b fix_event_date_issue origin/fix_event_date_issue

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

git checkout master_rails3
git merge --no-ff fix_event_date_issue
git push origin master_rails3