Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
W
webBuild
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 汤强勇
  • webBuild
  • Merge Requests
  • !18

Merged
Opened Dec 09, 2019 by 谢中龙@xiezl 
  • Report abuse
Report abuse

余额充值赠送0时不显示

余额充值赠送0时不显示

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b wxMall_UAT origin/wxMall_UAT

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout wxMall_PRD
git merge --no-ff wxMall_UAT

Step 4. Push the result of the merge to GitLab

git push origin wxMall_PRD

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

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

  • Discussion 0
  • Commits 2
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 谢中龙 @xiezl

    merged

    Dec 09, 2019

    merged

    merged
    Toggle commit list
  • 谢中龙 @xiezl

    mentioned in commit 5e563936

    Dec 09, 2019

    mentioned in commit 5e563936

    mentioned in commit 5e5639362a49697515e25371952eae7a7ccce508
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
Reference: Caden/webBuild!18
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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

Cherry-pick this merge request

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