Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
S
saas-manage
  • 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
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • chehuidong
  • saas-manage
  • Merge Requests
  • !30

Closed
Opened Feb 04, 2024 by qinjianhui@qinjianhui 
  • Report abuse
Report abuse

Dev

×

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 origin/dev

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 dev

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

    added 10 commits

    • e98c52df...73d4887b - 8 commits from branch master
    • ae49b7a2 - feat: 运维工具
    • 11def285 - 丢单管理功能

    Compare with previous version

    Feb 04, 2024

    added 10 commits

    • e98c52df...73d4887b - 8 commits from branch master
    • ae49b7a2 - feat: 运维工具
    • 11def285 - 丢单管理功能

    Compare with previous version

    added 10 commits * e98c52df...73d4887b - 8 commits from branch `master` * ae49b7a2 - feat: 运维工具 * 11def285 - 丢单管理功能 [Compare with previous version](http://47.99.244.21:9999/chehuidong/saas-manage/merge_requests/30/diffs?diff_id=2966&start_sha=e98c52dfdcd2426714e2b6817b2fbc38fecb13d7)
    Toggle commit list
  • qinjianhui @qinjianhui

    added 1 commit

    • 107e5931 - fix: 解决合并冲突

    Compare with previous version

    Feb 04, 2024

    added 1 commit

    • 107e5931 - fix: 解决合并冲突

    Compare with previous version

    added 1 commit * 107e5931 - fix: 解决合并冲突 [Compare with previous version](http://47.99.244.21:9999/chehuidong/saas-manage/merge_requests/30/diffs?diff_id=2967&start_sha=11def28529e0384ce9481b1d4b28d081d00b466a)
    Toggle commit list
  • qinjianhui @qinjianhui

    closed

    Feb 04, 2024

    closed

    closed
    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
1
1 participant
Reference: chehuidong/saas-manage!30