Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
M
mall-server
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • JIRA
    • JIRA
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • yimu
  • mall-server
  • Merge Requests
  • !17

Merged
Opened Mar 09, 2022 by wulixian@wulixian 
  • Report abuse
Report abuse

商品价格同步到规格表

Check out, review, and merge locally

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

git fetch origin
git checkout -b test origin/test

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 test

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.

  • Discussion 0
  • Commits 5
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • wulixian @wulixian

    added 3 commits

    • 9b1fd7e4 - 1 commit from branch master
    • e6096e47 - Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev
    • 6fba3e2f - Merge branch 'dev' into 'test'

    Compare with previous version

    · Mar 09, 2022

    added 3 commits

    • 9b1fd7e4 - 1 commit from branch master
    • e6096e47 - Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev
    • 6fba3e2f - Merge branch 'dev' into 'test'

    Compare with previous version

    added 3 commits <ul><li>9b1fd7e4 - 1 commit from branch <code>master</code></li><li>e6096e47 - Merge branch &#39;master&#39; of https://gitlab.33.cn/yimu/mall-server into dev</li><li>6fba3e2f - Merge branch &#39;dev&#39; into &#39;test&#39;</li></ul> [Compare with previous version](https://gitlab.33.cn/yimu/mall-server/merge_requests/17/diffs?diff_id=9911&start_sha=3957123899cb915aa9b90367af3dfb0927f10138)
    Toggle commit list
  • wulixian @wulixian

    merged

    · Mar 09, 2022

    merged

    merged
    Toggle commit list
  • wulixian @wulixian

    mentioned in commit de2c130a

    · Mar 09, 2022

    mentioned in commit de2c130a

    mentioned in commit de2c130ac6141e3152c50c397a9386c673cb0ba3
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: yimu/mall-server!17

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.