This adds support for libdmapsharing's 4.0 API without removing support for the earlier API. The newer version takes priority if both versions exist on the build host.
Signed-off-by: W. Michael Petullo firstname.lastname@example.org
Step 1. Fetch and check out the branch for this merge request
-# All repo/branch refs have been quoted to allow support for special characters (such as #my-branch) git fetch "https://gitlab.gnome.org/mikep/grilo-plugins.git" "libdmapsharing4" git checkout -b "mikep/grilo-plugins-libdmapsharing4" 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 "mikep/grilo-plugins-libdmapsharing4"
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.