Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
X
xiaomai-cloud-class-web
  • 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 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • xiaomai-cloud-class
  • xiaomai-cloud-class-web
  • Merge Requests
  • !51

Merged
Opened Jun 24, 2021 by maolipeng@maolipeng 
  • Report abuse
Report abuse

Feature/maolipeng/youhua

×

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/maolipeng/youhua origin/feature/maolipeng/youhua

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 feature/maolipeng/youhua

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 15
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • maolipeng @maolipeng

    merged

    Jun 24, 2021

    merged

    merged
    Toggle commit list
  • maolipeng @maolipeng

    mentioned in commit 9e1ba3d2

    Jun 24, 2021

    mentioned in commit 9e1ba3d2

    mentioned in commit 9e1ba3d2ba3a5ee4db10e670f54294553bce2b92
    Toggle commit list
  • zhujian
    @zhujian started a discussion on commit f022a67e Jun 24, 2021
    • zhujian @zhujian

      mentioned in commit f481a767

      Jun 24, 2021

      mentioned in commit f481a767

      mentioned in commit f481a76767be67e81188d0b75e0145366bf78a4b
      Toggle commit list
    Please register or sign in to reply
  • 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
1
1 participant
Reference: xiaomai-cloud-class/xiaomai-cloud-class-web!51
×

Revert this merge request

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.