Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

黄成意 / php_frq_api

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !5 opened Jun 04, 2021 by duwenjun@duwenjun 

Dev/ver/cloud 1.0.0

×

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/ver/cloud_1.0.0 origin/dev/ver/cloud_1.0.0

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/ver/cloud_1.0.0

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 36
  • Changes 362+
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • duwenjun @duwenjun

    added 2 commits

    • 452ab34c - 1 commit from branch master
    • 94f8cd52 - Merge branch 'master' into 'dev/ver/cloud_1.0.0'

    Compare with previous version

    Jun 04, 2021

    added 2 commits

    • 452ab34c - 1 commit from branch master
    • 94f8cd52 - Merge branch 'master' into 'dev/ver/cloud_1.0.0'

    Compare with previous version

    added 2 commits * 452ab34c - 1 commit from branch `master` * 94f8cd52 - Merge branch 'master' into 'dev/ver/cloud_1.0.0' [Compare with previous version](http://119.23.72.7/q578953158/php_frq_api/merge_requests/5/diffs?diff_id=3838&start_sha=479912fb5aadde8061bd59db443dcf972091a4ce)
    Toggle commit list
  • duwenjun @duwenjun

    merged

    Jun 04, 2021

    merged

    merged
    Toggle commit list
  • duwenjun @duwenjun

    mentioned in commit c39fe132

    Jun 04, 2021

    mentioned in commit c39fe132

    mentioned in commit c39fe132597abc6de0f52e8761e65a76551ae7e2
    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: q578953158/php_frq_api!5
×

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.