• 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
Merged
MR Merge Request !757 opened
2021-06-26 22:55:40 UTC by K'van @nsrr

Prevent Heroism lost life bonus from chaining infinitely.

Edited 2021-06-29 16:47:28 UTC
Request to merge nsrr:no-infinite-heroism into master
×

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 no-infinite-heroism
git checkout -b nsrr/t-engine4-no-infinite-heroism 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-no-infinite-heroism

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 1937f5e9. View details
CI build skipped for 1937f5e9. View details
CI build canceled for 1937f5e9. View details
CI build failed for 1937f5e9. View details
CI build running for 1937f5e9. View details
CI build pending for 1937f5e9. View details

Merged by DarkGod 2021-06-29 16:47:28 UTC

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 1
  • DarkGod
    @darkgod commented 2021-06-29 16:47:28 UTC

    mentioned in commit 905a4a6d

  • DarkGod
    @darkgod commented 2021-06-29 16:47:28 UTC

    Status changed to merged

  • Please register or login to post a comment
757 of 868
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!757
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.