• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 54
  • Labels
  • Forks
  • Snippets
  • Network
Open
MR Merge Request !852 opened
2022-08-04 22:07:58 UTC by K'van @nsrr

Mindresistfix

Corrects two instances of combat_mindresist to combat_mentalresist

Edited 2022-10-14 21:49:30 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge nsrr:mindresistfix into master (424 commits behind)
×

Check out, review, and merge locally

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

CI build passed for cbcbb77b. View details
CI build skipped for cbcbb77b. View details
CI build canceled for cbcbb77b. View details
CI build failed for cbcbb77b. View details
CI build running for cbcbb77b. View details
CI build pending for cbcbb77b. View details

Ready to be merged automatically

Ask someone with write access to this repository to merge this request.

  • Discussion 1
  • Commits 2
  • Builds 0
  • Changes 2
  • Please register or login to post a comment
852 of 870
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: tome/t-engine4!852