Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
amos-boot-zx-biz
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • 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
  • Jobs
  • Commits
  • 项目统一框架
  • 一体化_户用光伏项目代码
  • amos-boot-zx-biz
  • Merge Requests
  • !24

Merged
Opened Mar 14, 2025 by 吴江@wujiang 
  • Report abuse
Report abuse

Developer bw

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b developer_bw origin/developer_bw

Step 2. Review the changes locally

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

git checkout developer
git merge --no-ff developer_bw

Step 4. Push the result of the merge to GitLab

git push origin developer

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 185
  • Changes 174
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 吴江 @wujiang

    merged

    · Mar 14, 2025

    merged

    merged
    Toggle commit list
  • 吴江 @wujiang

    mentioned in commit b73bc0b7

    · Mar 14, 2025

    mentioned in commit b73bc0b7

    mentioned in commit b73bc0b71994121e2115f1c8293bed0d55288d16
    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
0
Labels
None
Assign labels
  • View project labels
Reference: moa/jxdj_zx/amos-boot-zx-biz!24

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.