• 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 !180 opened 2017-01-19 08:10:18 UTC by陈峰@chenfeng163

Release/5.4

Edited 2017-01-19 10:04:21 UTC
Request to merge release/5.4 into grey
×

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.4 origin/release/5.4

Step 2. Review the changes locally

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

git checkout grey
git merge --no-ff release/5.4

Step 4. Push the result of the merge to GitLab

git push origin grey

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 陈峰 2017-01-19 10:04:19 UTC

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

  • Discussion 0
  • Commits 221
  • Changes 145
  • 陈峰
    @chenfeng163 2017-01-19 08:13:32 UTC

    Added 2 commits:

    • 83981ab6 - 模糊搜索接口增加physical_channel字段
    • 87e6a41c - Merge branch 'hotfix/channel' into 'release/5.4'
  • 陈峰
    @chenfeng163 2017-01-19 09:21:43 UTC

    Added 2 commits:

    • 551042a5 - order-first-only-desc
    • c5f7b090 - Merge branch 'feature/new-goods' into 'release/5.4'
  • 陈峰
    @chenfeng163 2017-01-19 10:03:42 UTC

    Added 3 commits:

    • 44fba97f - yas 升级版本
    • 2156582d - Merge branch 'feature/updyas' into 'master'
    • 6785b95a - Merge branch 'master' into release/5.4
  • 陈峰
    @chenfeng163 2017-01-19 10:04:19 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2017-01-19 10:04:21 UTC

    mentioned in commit 23e6599e

  • Please register or login to post a comment
180 of 1800
Prev Next
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuywap-node!180
×

Revert this merge request

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

Cherry-pick this merge request

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