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
  • !599

Merged
Opened Nov 28, 2024 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 release
git merge --no-ff feature

Step 4. Push the result of the merge to GitLab

git push origin release

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 10
  • Changes 22
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 陈健智 @chenjianzhi

    added 1 commit

    • 9bfe4fa6 - 数据用量预警推送启动环境条件调整

    Compare with previous version

    Nov 28, 2024

    added 1 commit

    • 9bfe4fa6 - 数据用量预警推送启动环境条件调整

    Compare with previous version

    added 1 commit * 9bfe4fa6 - 数据用量预警推送启动环境条件调整 [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/599/diffs?diff_id=28932&start_sha=85c38fa5efdde0532ce13575fa41dcd4bb653e6e)
    Toggle commit list
  • shenjunjie @bigSprite

    added 2 commits

    • 9a94ae7e - 豆包模型实体类相关
    • 73007c4f - Merge remote-tracking branch 'origin/feature' into feature

    Compare with previous version

    Nov 29, 2024

    added 2 commits

    • 9a94ae7e - 豆包模型实体类相关
    • 73007c4f - Merge remote-tracking branch 'origin/feature' into feature

    Compare with previous version

    added 2 commits * 9a94ae7e - 豆包模型实体类相关 * 73007c4f - Merge remote-tracking branch 'origin/feature' into feature [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/599/diffs?diff_id=28940&start_sha=9bfe4fa684dda9f8acf2c8b9f0304b8785f1eba7)
    Toggle commit list
  • 陈健智 @chenjianzhi

    added 1 commit

    • 3d612e2c - 批量编辑用户权限调整

    Compare with previous version

    Nov 29, 2024

    added 1 commit

    • 3d612e2c - 批量编辑用户权限调整

    Compare with previous version

    added 1 commit * 3d612e2c - 批量编辑用户权限调整 [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/599/diffs?diff_id=28943&start_sha=73007c4f6a69704b224c7d5d9b0548db636ff384)
    Toggle commit list
  • 陈健智 @chenjianzhi

    added 1 commit

    • 056f7acf - 豆包模型相关补充

    Compare with previous version

    Dec 03, 2024

    added 1 commit

    • 056f7acf - 豆包模型相关补充

    Compare with previous version

    added 1 commit * 056f7acf - 豆包模型相关补充 [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/599/diffs?diff_id=28977&start_sha=3d612e2cea58ce39a8e961a194b8f83910a5a9ac)
    Toggle commit list
  • 陈健智 @chenjianzhi

    added 1 commit

    • 2782ec85 - 事件影响力计算表格读取优化

    Compare with previous version

    Dec 03, 2024

    added 1 commit

    • 2782ec85 - 事件影响力计算表格读取优化

    Compare with previous version

    added 1 commit * 2782ec85 - 事件影响力计算表格读取优化 [Compare with previous version](http://git.zhiweidata.top/bigSprite/brandkbs2/merge_requests/599/diffs?diff_id=28979&start_sha=056f7acfb503ad778b4004a30b1dcf2ba35243e1)
    Toggle commit list
  • shenjunjie @bigSprite

    merged

    Dec 04, 2024

    merged

    merged
    Toggle commit list
  • shenjunjie @bigSprite

    mentioned in commit 6b660635

    Dec 04, 2024

    mentioned in commit 6b660635

    mentioned in commit 6b66063555aed7c428849bb5e3375f37c3e7934c
    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!599
×

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.