• 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 !262 opened 2017-02-17 07:27:02 UTC by张孝茹@zhangxiaoru

订单详情页地址修改

Edited 2017-02-23 11:51:32 UTC
Request to merge feature/homeAdress 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/homeAdress origin/feature/homeAdress

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

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-17 10:34:55 UTC

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

  • Discussion 0
  • Commits 4
  • Changes 13
  • 张孝茹
    @zhangxiaoru 2017-02-17 10:05:14 UTC
    Developer

    Added 180 commits:

    • 88de751b...0f4786fa - 179 commits from branch release/5.4.1
    • cb607bc2 - merge release/5.4.1
  • 张孝茹
    @zhangxiaoru 2017-02-17 10:23:49 UTC
    Developer

    Added 2 commits:

    • fa9a6306 - 添加地址
    • 1d0f7fa4 - 添加地址
  • 张孝茹
    @zhangxiaoru 2017-02-17 10:34:55 UTC
    Developer

    Status changed to merged

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