Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
VuhDo
VuhDo
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 122
    • Issues 122
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 5
    • Merge Requests 5
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • VuhDo
  • VuhDoVuhDo
  • Merge Requests
  • !27

Open
Opened Dec 28, 2020 by momo@momo
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.vuhdo.io/momo/vuhdo.git" "healinc_color"
git checkout -b "momo/vuhdo-healinc_color" 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 "classic"
git merge --no-ff "momo/vuhdo-healinc_color"

Step 4. Push the result of the merge to GitLab

git push origin "classic"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

[New feature]check incoming heal,and display different color

  • Overview 8
  • Commits 1
  • Pipelines 1
  • Changes 2

WARNING: This is a pre-patch

This MR almost complete the feature request #190

Vuhdo will check the queue of libhealcomm-4 and display the green incoming heal bar if player's heal is first,or the red bar if others' is first,or the yellow bar if they are conflict

The configuration page is still missing, please check whether the feature is qualified

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
Labels
Classic Feature Request Waiting
Assign labels
  • View project labels
Reference: vuhdo/vuhdo!27