Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
7
7-Eleven
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • 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
  • 高淑倩
  • 7-Eleven
  • Merge Requests
  • !198

Merged
Opened Apr 28, 2020 by 谢中龙@xiezl 
  • Report abuse
Report abuse

Mall dev 7.11.0

Mall dev 7.11.0

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b mall_dev_7.11.0 origin/mall_dev_7.11.0

Step 2. Review the changes locally

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

git checkout mall_dev_7.12.0
git merge --no-ff mall_dev_7.11.0

Step 4. Push the result of the merge to GitLab

git push origin mall_dev_7.12.0

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 6
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 谢中龙 @xiezl

    added 7 commits

    • 94514429...9be51b90 - 6 commits from branch mall_dev_7.12.0
    • d859f7c1 - Merge branch 'mall_dev_7.12.0' into 'mall_dev_7.11.0'

    Compare with previous version

    Apr 28, 2020

    added 7 commits

    • 94514429...9be51b90 - 6 commits from branch mall_dev_7.12.0
    • d859f7c1 - Merge branch 'mall_dev_7.12.0' into 'mall_dev_7.11.0'

    Compare with previous version

    added 7 commits <ul><li>94514429...9be51b90 - 6 commits from branch <code>mall_dev_7.12.0</code></li><li>d859f7c1 - Merge branch &#39;mall_dev_7.12.0&#39; into &#39;mall_dev_7.11.0&#39;</li></ul> [Compare with previous version](http://gitlab.bigaka.net/gaoshq/7-Eleven/merge_requests/198/diffs?diff_id=2210&start_sha=9451442956545ed3eff9b5bdb373e7b39ca7f154)
    Toggle commit list
  • 谢中龙 @xiezl

    mentioned in commit 176c5f5f

    Apr 28, 2020

    mentioned in commit 176c5f5f

    mentioned in commit 176c5f5f78a08d1ba5e1e5f5bbc8e9776d55fa2a
    Toggle commit list
  • 谢中龙 @xiezl

    merged

    Apr 28, 2020

    merged

    merged
    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 labels
Reference: gaoshq/7-Eleven!198
×

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.