Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
B
brandkbs2
  • 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
  • shenjunjie
  • brandkbs2
  • Merge Requests
  • !72

Merged
Opened Nov 10, 2022 by shenjunjie@bigSprite 
  • Report abuse
Report abuse

Feature

×

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

Step 2. Review the changes locally

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

git checkout dev
git merge --no-ff feature

Step 4. Push the result of the merge to GitLab

git push origin dev

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 6
  • Changes 28
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • shenjunjie @bigSprite

    added 1 commit

    • b37abbcd - 添加event结束状态判断2

    Compare with previous version

    Nov 10, 2022

    added 1 commit

    • b37abbcd - 添加event结束状态判断2

    Compare with previous version

    added 1 commit * b37abbcd - 添加event结束状态判断2 [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/72/diffs?diff_id=16632&start_sha=f60b13c15cbf397c1cf0fb63031865188cbeb9da)
    Toggle commit list
  • shenjunjie @bigSprite

    added 1 commit

    • 61c2e442 - 添加event结束状态判断3

    Compare with previous version

    Nov 10, 2022

    added 1 commit

    • 61c2e442 - 添加event结束状态判断3

    Compare with previous version

    added 1 commit * 61c2e442 - 添加event结束状态判断3 [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/72/diffs?diff_id=16633&start_sha=b37abbcd37731f628840a6d8d9889ee813cfa27e)
    Toggle commit list
  • shenjunjie @bigSprite

    merged

    Nov 10, 2022

    merged

    merged
    Toggle commit list
  • shenjunjie @bigSprite

    mentioned in commit 8408fc8b

    Nov 10, 2022

    mentioned in commit 8408fc8b

    mentioned in commit 8408fc8b6bc1e38aa37b9625b4655e8a42a50701
    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
Reference: bigSprite/brandkbs2!72
×

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.