Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Contribute to GitLab
  • Sign in
P
pension
  • Project
    • Project
    • 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
  • mengmeng
  • pension
  • Merge Requests
  • !18

Merged
Opened 4 years ago by shenyuanfeng@shenyuanfeng
  • Report abuse
Report abuse

Shen

Check out, review, and merge locally

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

git fetch origin
git checkout -b Shen origin/Shen

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff Shen

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.

Request to merge Shen into master

Merged by zsh 4 years ago

The changes were merged into master with 4f369cd6

  • Discussion 0
  • Commits 5
  • Changes 15
Please register or sign in to reply
  1. 19 Mar, 2021 5 commits
    • mlchun's avatar
      1.注册信息优化 · c30e13b6
      mlchun authored 4 years ago
      c30e13b6
    • mlchun's avatar
      1.注册信息优化 · d774347f
      mlchun authored 4 years ago
      d774347f
    • mlchun's avatar
      1.注册、登录、切换身份 · 22eeac2a
      mlchun authored 4 years ago
      22eeac2a
    • mlchun's avatar
      1.注册、登录 · 545beac6
      mlchun authored 4 years ago
      545beac6
    • mlchun's avatar
      1.老人家属列表添加姓名 · 6de52e01
      mlchun authored 4 years ago
      6de52e01
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
None
Time tracking
No estimate or time spent
0
Labels
None
Assign labels
  • View project labels
Lock merge request
Unlocked
2
2 participants
user avatar
zsh
user avatar
shenyuanfeng
Reference: xie/pension!18

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.