merging ui_dev changes to ui_test
Updating the ui_test branch to ahve the most recent changes applied to ui_dev.
Updating the ui_test branch to ahve the most recent changes applied to ui_dev.
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b ui_dev origin/ui_dev
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/ui_test git merge --no-ff ui_dev
Step 4. Push the result of the merge to GitLab
git push origin ui_test
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.