• 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 !76 opened 2016-12-27 07:45:36 UTC by陈轩@chenxuan

Hotfix/wap im

可以直接合, 显示改为 按后台配置来

Edited 2016-12-27 07:47:47 UTC
Request to merge hotfix/wap-im into master
×

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/wap-im origin/hotfix/wap-im

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff hotfix/wap-im

Step 4. Push the result of the merge to GitLab

git push origin master

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-27 07:47:47 UTC

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

  • Discussion 0
  • Commits 2
  • Changes 1
  • 毕凯
    @bikai 2016-12-27 07:47:47 UTC

    Status changed to merged

  • 毕凯
    @bikai 2016-12-27 07:47:47 UTC

    mentioned in commit 20591087

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

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.