• 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 !290 opened 2017-02-23 06:11:16 UTC by郭成尧@chengyao

第三方统计优化

Edited 2017-02-23 06:18:12 UTC
Request to merge feature/fxcmd into release/5.4.1
×

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/fxcmd origin/feature/fxcmd

Step 2. Review the changes locally

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

git checkout release/5.4.1
git merge --no-ff feature/fxcmd

Step 4. Push the result of the merge to GitLab

git push origin release/5.4.1

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-02-23 06:18:12 UTC

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

  • Discussion 0
  • Commits 4
  • Changes 4
  • 郭成尧
    @chengyao 2017-02-23 06:16:02 UTC

    Added 1 commit:

    • 2a66c134 - timeout
  • 郭成尧
    @chengyao 2017-02-23 06:17:15 UTC

    Added 1 commit:

    • 3bd629a3 - timeout
  • 毕凯
    @bikai 2017-02-23 06:18:12 UTC

    mentioned in commit cfa6e245

  • 毕凯
    @bikai 2017-02-23 06:18:12 UTC

    Status changed to merged

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

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.