Step 1.
Fetch and check out the branch for this merge request
git fetch "https://gitlab.torproject.org/nickm/tor.git" "onionk_protocommas2"
git checkout -b "nickm/tor-onionk_protocommas2" FETCH_HEAD
Step 2.
Review the changes locally
Step 3.
Merge the branch and fix any conflicts that come up
git fetch origin
git checkout "maint-0.3.5"
git merge --no-ff "nickm/tor-onionk_protocommas2"
Step 4.
Push the result of the merge to GitLab
git push origin "maint-0.3.5"
Note that pushing to GitLab requires write access to this repository.
Tip:
You can also checkout merge requests locally by
following these guidelines.
