• This project
    • Loading...
  • Sign in

fe / yohobuywap-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !80 opened 2016-12-28 02:38:34 UTC by郭成尧@chengyao

解决秒杀出现两次的问题,合并 Master 分支

Edited 2016-12-28 02:53:16 UTC
Request to merge release/5.3.1 into gray
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b release/5.3.1 origin/release/5.3.1

Step 2. Review the changes locally

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

git checkout gray
git merge --no-ff release/5.3.1

Step 4. Push the result of the merge to GitLab

git push origin gray

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

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

Merged by 毕凯 2016-12-28 02:53:16 UTC

The changes were merged into gray. The source branch has been removed.

  • Discussion 0
  • Commits 9
  • Changes 3
  • 毕凯
    @bikai 2016-12-28 02:52:18 UTC

    Added 6 commits:

    • 22c9ca8e...ff910baa - 3 commits from branch gray
    • cd220563 - Merge branch 'master' into gray
    • f4dff4b6 - Merge branch 'gray' of git.yoho.cn:fe/yohobuywap-node into gray
    • 4156b2c8 - Merge branch 'gray' into release/5.3.1
  • 毕凯
    @bikai 2016-12-28 02:53:16 UTC

    Status changed to merged

  • Please register or login to post a comment
80 of 1800
Prev Next
毕凯
Assignee
毕凯 @bikai
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuywap-node!80