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

Merged
Opened Dec 09, 2024 by qinjianhui@qinjianhui 
  • 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 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 4
  • Changes 11
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • qinjianhui @qinjianhui

    restored source branch dev

    May 09, 2025

    restored source branch dev

    restored source branch `dev`
    Toggle commit list
  • qinjianhui @qinjianhui

    added 88 commits

    • f4c82979..03e7f665 - 88 commits from branch master

    Compare with previous version

    May 09, 2025

    added 88 commits

    • f4c82979..03e7f665 - 88 commits from branch master

    Compare with previous version

    added 88 commits * f4c82979..03e7f665 - 88 commits from branch `master` [Compare with previous version](http://47.122.114.111:9999/qinjianhui/factory_front/merge_requests/7/diffs?diff_id=5191&start_sha=0000000000000000000000000000000000000000)
    Toggle commit list
  • qinjianhui @qinjianhui

    added 1 commit

    • 74808dd1 - feat: POD美国生产

    Compare with previous version

    May 09, 2025

    added 1 commit

    • 74808dd1 - feat: POD美国生产

    Compare with previous version

    added 1 commit * 74808dd1 - feat: POD美国生产 [Compare with previous version](http://47.122.114.111:9999/qinjianhui/factory_front/merge_requests/7/diffs?diff_id=6203&start_sha=03e7f6659d6d277ac014013a4a4c21908e494b5a)
    Toggle commit list
  • qinjianhui @qinjianhui

    added 1 commit

    • 0a232b26 - fix: 问题修改

    Compare with previous version

    May 09, 2025

    added 1 commit

    • 0a232b26 - fix: 问题修改

    Compare with previous version

    added 1 commit * 0a232b26 - fix: 问题修改 [Compare with previous version](http://47.122.114.111:9999/qinjianhui/factory_front/merge_requests/7/diffs?diff_id=6205&start_sha=74808dd16fdf75fb63863fcb50a8cbc572386a4b)
    Toggle commit list
  • qinjianhui @qinjianhui

    added 1 commit

    • ed638dda - fix: 问题修改

    Compare with previous version

    May 10, 2025

    added 1 commit

    • ed638dda - fix: 问题修改

    Compare with previous version

    added 1 commit * ed638dda - fix: 问题修改 [Compare with previous version](http://47.122.114.111:9999/qinjianhui/factory_front/merge_requests/7/diffs?diff_id=6208&start_sha=0a232b26753bc587b81b6c7049de11ea0d1ec619)
    Toggle commit list
  • qinjianhui @qinjianhui

    merged

    May 10, 2025

    merged

    merged
    Toggle commit list
  • qinjianhui @qinjianhui

    mentioned in commit 6a68ee79

    May 10, 2025

    mentioned in commit 6a68ee79

    mentioned in commit 6a68ee79dfa8cb4102b2da63cf25b4e041927468
    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
1
1 participant
Reference: qinjianhui/factory_front!7
×

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.