Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
X
XiTianSenMall
  • 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
  • leiqingsong
  • XiTianSenMall
  • Merge Requests
  • !107

Merged
Opened 4 years ago by leiqingsong@Song
  • 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 dev_lqs origin/dev_lqs

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 dev_lqs

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 dev_lqs into master

Merged by leiqingsong 4 years ago

The changes were merged into master with 60b9baee

  • Discussion 0
  • Commits 1
  • Changes 2
  • leiqingsong @Song merged · 4 years ago

    merged

  • leiqingsong @Song mentioned in commit 60b9baee · 4 years ago

    mentioned in commit 60b9baee

Please register or sign in to reply
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
1
1 participant
user avatar
Reference: Song/xitiansenmall!107

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.