Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
S
szse
  • 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
  • zhaochengxiang
  • szse
  • Merge Requests
  • !1

Merged
Opened Jun 07, 2021 by zhaochengxiang@zcx 
  • Report abuse
Report abuse

Dev 2106

×

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

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-2106

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 1
  • Commits 11
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • zhaochengxiang @zcx

    added 15 commits

    • 71efdb3a...d8648343 - 14 commits from branch master
    • 5ce9dced - Merge branch 'master' into 'dev-2106'

    Compare with previous version

    Jun 07, 2021

    added 15 commits

    • 71efdb3a...d8648343 - 14 commits from branch master
    • 5ce9dced - Merge branch 'master' into 'dev-2106'

    Compare with previous version

    added 15 commits <ul><li>71efdb3a...d8648343 - 14 commits from branch <code>master</code></li><li>5ce9dced - Merge branch &#39;master&#39; into &#39;dev-2106&#39;</li></ul> [Compare with previous version](http://132.232.112.242:7090/zcx/szse/merge_requests/1/diffs?diff_id=3&start_sha=71efdb3a3686b4dbf1201558af284d73fce8840d)
    Toggle commit list
  • zhaochengxiang @zcx commented Jun 07, 2021
    Master

    关系图优化

    关系图优化
  • zhaochengxiang @zcx

    merged

    Jun 07, 2021

    merged

    merged
    Toggle commit list
  • zhaochengxiang @zcx

    mentioned in commit 12bc56c5

    Jun 07, 2021

    mentioned in commit 12bc56c5

    mentioned in commit 12bc56c55a5b1b62fe5da17b175ea6ae9d3ad7b2
    Toggle commit list
  • zhaochengxiang
    @zcx started a discussion on commit 5ce9dced Jun 07, 2021
    Last updated by zhaochengxiang Jun 07, 2021
    • zhaochengxiang @zcx

      mentioned in commit bb1563ab

      Jun 07, 2021

      mentioned in commit bb1563ab

      mentioned in commit bb1563ab523f22a8a734c0024b147479b6e81ec7
      Toggle commit list
    • zhaochengxiang @zcx

      mentioned in merge request !2 (merged)

      Jun 07, 2021

      mentioned in merge request !2 (merged)

      mentioned in merge request !2
      Toggle commit list
    • zhaochengxiang @zcx

      mentioned in commit 9cff8f7d

      Jun 07, 2021

      mentioned in commit 9cff8f7d

      mentioned in commit 9cff8f7d0787b84d9bf409e3fc62fd688f31057d
      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
0
Labels
None
Assign labels
  • View project labels
Reference: zcx/szse!1
×

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.