• 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 !1742 opened 2019-04-29 03:34:35 UTC by陈峰@chenfeng163

Feature/redis

Edited 2019-04-29 03:46:11 UTC
Request to merge feature/redis into release/6.9.2
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/redis origin/feature/redis

Step 2. Review the changes locally

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

git checkout release/6.9.2
git merge --no-ff feature/redis

Step 4. Push the result of the merge to GitLab

git push origin release/6.9.2

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 陈峰 2019-04-29 03:46:11 UTC

The changes were merged into release/6.9.2. The source branch has been removed.

  • Discussion 0
  • Commits 5
  • Changes 3
  • 陈峰
    @chenfeng163 2019-04-29 03:35:20 UTC

    Added 19 commits:

    • 7dddefd8...ceef09c3 - 17 commits from branch release/6.9.2
    • 7afa5a61 - Merge branch 'release/6.9.2' into feature/redis
    • 7bca2e1c - Merge branch 'feature/redis' of http://git.yoho.cn/fe/yohobuywap-node into feature/redis
  • 陈峰
    @chenfeng163 2019-04-29 03:46:11 UTC

    mentioned in commit d300fb72

  • 陈峰
    @chenfeng163 2019-04-29 03:46:11 UTC

    Status changed to merged

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

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.