Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
amos-boot-biz
  • Project
    • Project
    • 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
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 项目统一框架
  • amos-boot-biz
  • Merge Requests
  • !18

Merged
Opened Mar 16, 2023 by 吴江@wujiang 
  • Report abuse
Report abuse

Fb jxiop v1.0.0 230202

Check out, review, and merge locally

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

git fetch origin
git checkout -b fb_jxiop_V1.0.0_230202 origin/fb_jxiop_V1.0.0_230202

Step 2. Review the changes locally

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

git checkout develop_dl_plan6_temp
git merge --no-ff fb_jxiop_V1.0.0_230202

Step 4. Push the result of the merge to GitLab

git push origin develop_dl_plan6_temp

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

    added 225 commits

    • 0589d8f6...e996f7ee - 224 commits from branch develop_dl_plan6_temp
    • 62191e64 - Merge branch 'develop_dl_plan6_temp' into 'fb_jxiop_V1.0.0_230202'

    Compare with previous version

    · Mar 16, 2023

    added 225 commits

    • 0589d8f6...e996f7ee - 224 commits from branch develop_dl_plan6_temp
    • 62191e64 - Merge branch 'develop_dl_plan6_temp' into 'fb_jxiop_V1.0.0_230202'

    Compare with previous version

    added 225 commits <ul><li>0589d8f6...e996f7ee - 224 commits from branch <code>develop_dl_plan6_temp</code></li><li>62191e64 - Merge branch &#39;develop_dl_plan6_temp&#39; into &#39;fb_jxiop_V1.0.0_230202&#39;</li></ul> [Compare with previous version](http://39.98.45.134:8090/moa/amos-boot-biz/merge_requests/18/diffs?diff_id=395&start_sha=0589d8f6cf6aa295ebc39f58ffe2f53575ac8e02)
    Toggle commit list
  • 吴江 @wujiang

    merged

    · Mar 16, 2023

    merged

    merged
    Toggle commit list
  • 吴江 @wujiang

    mentioned in commit 9a61a8fb

    · Mar 16, 2023

    mentioned in commit 9a61a8fb

    mentioned in commit 9a61a8fb40566ed7635ae0d638b5c85e9934bdcc
    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/amos-boot-biz!18