depends on front!349
Step 1. Fetch and check out the branch for this merge request
git fetch https://gitlab.com/eiennohi/engine.git sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw git checkout -b eiennohi/engine-sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw 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 eiennohi/engine-sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
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.
Allows commits from members who can merge to the target branch
Deletes source branch
mentioned in merge request front!349