omemo version 2.0.3
- port changes from master up to 1.0.3
Step 1. Fetch and check out the branch for this merge request
git fetch "https://dev.gajim.org/lovetox/gajim-plugins.git" "omemo" git checkout -b "lovetox/gajim-plugins-omemo" 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/gtk3" git merge --no-ff "lovetox/gajim-plugins-omemo"
Step 4. Push the result of the merge to GitLab
git push origin "gtk3"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.