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

Merged
Opened Aug 12, 2022 by 吴江@wujiang 
  • Report abuse
Report abuse

Developer

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 origin/developer

Step 2. Review the changes locally

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

git checkout develop_unit_register
git merge --no-ff developer

Step 4. Push the result of the merge to GitLab

git push origin develop_unit_register

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

    added 20 commits

    • 3f462467...d8cbac02 - 19 commits from branch develop_unit_register
    • feea2f1d - Merge branch 'develop_unit_register' into 'developer'

    Compare with previous version

    · Aug 12, 2022

    added 20 commits

    • 3f462467...d8cbac02 - 19 commits from branch develop_unit_register
    • feea2f1d - Merge branch 'develop_unit_register' into 'developer'

    Compare with previous version

    added 20 commits <ul><li>3f462467...d8cbac02 - 19 commits from branch <code>develop_unit_register</code></li><li>feea2f1d - Merge branch &#39;develop_unit_register&#39; into &#39;developer&#39;</li></ul> [Compare with previous version](http://39.98.45.134/moa/amos-boot-biz/merge_requests/10/diffs?diff_id=382&start_sha=3f46246753489882cf4e30c00fc053638a807cdb)
    Toggle commit list
  • 吴江 @wujiang

    merged

    · Aug 12, 2022

    merged

    merged
    Toggle commit list
  • 吴江 @wujiang

    mentioned in commit f3807ca9

    · Aug 12, 2022

    mentioned in commit f3807ca9

    mentioned in commit f3807ca98992f10c4b73728d2da37d35f7228ac9
    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!10

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.