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 !7 opened Jul 13, 2021 by 连敬荣@lianjr03 

Feature/lianjingrong/20210524

报价供应商名称取消搜索,改为采购输入

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/lianjingrong/20210524 origin/feature/lianjingrong/20210524

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 feature/lianjingrong/20210524

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 23
  • Changes 22
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 连敬荣 @lianjr03

    added 7 commits

    • 1693714e...e61836c3 - 6 commits from branch master
    • d1b63cb4 - Merge branch 'master' into 'feature/lianjingrong/20210524'

    Compare with previous version

    Jul 13, 2021

    added 7 commits

    • 1693714e...e61836c3 - 6 commits from branch master
    • d1b63cb4 - Merge branch 'master' into 'feature/lianjingrong/20210524'

    Compare with previous version

    added 7 commits * 1693714e...e61836c3 - 6 commits from branch `master` * d1b63cb4 - Merge branch 'master' into 'feature/lianjingrong/20210524' [Compare with previous version](http://119.23.72.7/q578953158/php_frq_api/merge_requests/7/diffs?diff_id=3884&start_sha=1693714ed2f05d810398d5bac165f191406060a1)
    Toggle commit list
  • 连敬荣 @lianjr03

    merged

    Jul 13, 2021

    merged

    merged
    Toggle commit list
  • 连敬荣 @lianjr03

    mentioned in commit 44262997

    Jul 13, 2021

    mentioned in commit 44262997

    mentioned in commit 44262997ac4b88e508e1d27b7ff9e47b17b5ddae
    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!7
×

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.