Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
C
CFFP-HB
  • 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
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Chao Sun
  • CFFP-HB
  • Merge Requests
  • !1

Merged
Opened May 08, 2025 by yuzhenWang@yuzhenWang 
  • Report abuse
Report abuse

Uat

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b uat origin/uat

Step 2. Review the changes locally

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

git checkout dev
git merge --no-ff uat

Step 4. Push the result of the merge to GitLab

git push origin dev

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 3
  • Changes 11
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • yuzhenWang @yuzhenWang

    added 5 commits

    • 1e2e71ef...096ff857 - 4 commits from branch dev
    • 963ad6ed - 合并dev代码

    Compare with previous version

    May 08, 2025

    added 5 commits

    • 1e2e71ef...096ff857 - 4 commits from branch dev
    • 963ad6ed - 合并dev代码

    Compare with previous version

    added 5 commits * 1e2e71ef...096ff857 - 4 commits from branch `dev` * 963ad6ed - 合并dev代码 [Compare with previous version](http://139.224.139.2:9091/chaosun/CFFP/merge_requests/1/diffs?diff_id=52&start_sha=1e2e71ef99af3f8fdc1515407ecab862fc7f5888)
    Toggle commit list
  • yuzhenWang @yuzhenWang

    merged

    May 15, 2025

    merged

    merged
    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: chaosun/CFFP!1