Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
F
factory_front
  • 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 1
    • Merge Requests 1
  • 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
  • qinjianhui
  • factory_front
  • Merge Requests
  • !120

Merged
Opened Dec 08, 2025 by qinjianhui@qinjianhui 
  • Report abuse
Report abuse

fix: 修改 CLODOP 打不开问题

×

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

    merged

    Dec 08, 2025

    merged

    merged
    Toggle commit list
  • qinjianhui @qinjianhui

    mentioned in commit 38650fb5

    Dec 08, 2025

    mentioned in commit 38650fb5

    mentioned in commit 38650fb50943aa3ff6002edb51f76b3b921e7992
    Toggle commit list
  • qinjianhui
    @qinjianhui started a discussion on commit 11caae4f Dec 08, 2025
    Last updated by qinjianhui Dec 08, 2025
    • qinjianhui @qinjianhui

      mentioned in commit 28c24885

      Dec 08, 2025

      mentioned in commit 28c24885

      mentioned in commit 28c248852da08b215911f42ef62726d52e75eb82
      Toggle commit list
    • qinjianhui @qinjianhui

      mentioned in merge request !121 (merged)

      Dec 08, 2025

      mentioned in merge request !121 (merged)

      mentioned in merge request !121
      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
1
1 participant
Reference: qinjianhui/factory_front!120
×

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.