Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
S
sl-ai
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Boards
    • 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
  • zhouwei
  • sl-ai
  • Merge Requests
  • !10

Merged
Opened 1 month ago by zhouwei@zhouwei
  • 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 fetch origin
git checkout "origin/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.

Request to merge dev into master
  • Email patches
  • Plain diff

Merged by zhouwei 1 month ago

The changes were merged into master with e3e37317

  • Discussion 0
  • Commits 3
  • Changes 3
  • Loading...
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
  1. 29 Apr, 2025 1 commit
    • zhouwei's avatar
      新增提取新闻中的国家和城市信息 · 8202f94f
      zhouwei authored 1 month ago
      8202f94f
  2. 23 Apr, 2025 2 commits
    • zhouwei's avatar
      新增紧急通知处理接口 · d1bd4b38
      zhouwei authored 1 month ago
      d1bd4b38
    • zhouwei's avatar
      新增紧急通知处理接口 · 95b8c64a
      zhouwei authored 1 month ago
      95b8c64a
0 Assignees
None
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
zhouwei
Reference: zhouwei/sl-ai!10

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.