• 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 !1205 opened 2018-01-08 13:38:10 UTC by郭成尧@chengyao

Hotfix/sale

Edited 2018-01-08 13:50:24 UTC
Request to merge hotfix/sale 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/sale origin/hotfix/sale

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/sale

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 毕凯 2018-01-08 13:50:24 UTC

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

  • Discussion 0
  • Commits 7
  • Changes 7
  • 郭成尧
    @chengyao 2018-01-08 13:43:52 UTC

    Added 2 commits:

    • 1bb44639 - up-lib-version
    • 90c682ad - Merge branches 'hotfix/sale' and 'hotfix/sale' of git.yoho.cn:fe/yohobuywap-node into hotfix/sale
  • 毕凯
    @bikai 2018-01-08 13:46:11 UTC

    Added 2 commits:

    • fe49cf20 - '非mip页面不须要加载baidu-js'
    • 50d3b3a1 - Merge branch 'hotfix/baiduJsonLd' into 'hotfix/sale'
  • 毕凯
    @bikai 2018-01-08 13:50:24 UTC

    Status changed to merged

  • 毕凯
    @bikai 2018-01-08 13:50:24 UTC

    mentioned in commit c59cc776

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

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.