• 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 !621 opened 2017-06-02 04:16:32 UTC by李靖@lijing_yoho

数据重复

Edited 2017-06-02 04:17:32 UTC
Request to merge hotfix/baseAct into feature/cs-quit-queue
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b hotfix/baseAct origin/hotfix/baseAct

Step 2. Review the changes locally

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

git checkout feature/cs-quit-queue
git merge --no-ff hotfix/baseAct

Step 4. Push the result of the merge to GitLab

git push origin feature/cs-quit-queue

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-06-02 04:17:32 UTC

The changes were merged into feature/cs-quit-queue. The source branch has been removed.

  • Discussion 0
  • Commits 1
  • Changes 1
  • 毕凯
    @bikai 2017-06-02 04:17:28 UTC

    Target branch changed from master to feature/cs-quit-queue

  • 毕凯
    @bikai 2017-06-02 04:17:32 UTC

    mentioned in commit ef0f6b73

  • 毕凯
    @bikai 2017-06-02 04:17:32 UTC

    Status changed to merged

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

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.