Corrects two instances of combat_mindresist to combat_mentalresist
Step 1. Fetch and check out the branch for this merge request
git fetch https://git.net-core.org/nsrr/t-engine4.git mindresistfix git checkout -b nsrr/t-engine4-mindresistfix FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout master git merge --no-ff nsrr/t-engine4-mindresistfix
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
Ask someone with write access to this repository to merge this request.