Step 1.
Fetch and check out the branch for this merge request
git fetch "https://gitlab.xiph.org/chouquette/icecast-common.git" "videolan_patches_upstream"
git checkout -b "chouquette/icecast-common-videolan_patches_upstream" 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 "origin/master"
git merge --no-ff "chouquette/icecast-common-videolan_patches_upstream"
Step 4.
Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip:
You can also checkout merge requests locally by
following these guidelines.
