Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
article
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 2
    • Issues 2
    • List
    • Board
    • Labels
    • Milestones
  • JIRA
    • JIRA
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 王志文
  • article
  • Merge Requests
  • !2

Open
Opened Jun 29, 2019 by 王志文@wzw 
  • Report abuse
Report abuse

Wzw master patch 10501

Check out, review, and merge locally

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

git fetch origin
git checkout -b wzw-master-patch-10501 origin/wzw-master-patch-10501

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 wzw-master-patch-10501

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 4
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 王志文 @wzw

    added 1 commit

    • e43441ce - Update a.sh

    Compare with previous version

    · Jun 29, 2019

    added 1 commit

    • e43441ce - Update a.sh

    Compare with previous version

    added 1 commit <ul><li>e43441ce - Update a.sh</li></ul> [Compare with previous version](https://gitlab.33.cn/wzw/article/merge_requests/2/diffs?diff_id=4822&start_sha=44493d80a3c50acd4ec258635b43e884acd1e574)
    Toggle commit list
  • 王志文 @wzw

    added 1 commit

    • 29039fa0 - Update a.sh

    Compare with previous version

    · Jun 29, 2019

    added 1 commit

    • 29039fa0 - Update a.sh

    Compare with previous version

    added 1 commit <ul><li>29039fa0 - Update a.sh</li></ul> [Compare with previous version](https://gitlab.33.cn/wzw/article/merge_requests/2/diffs?diff_id=4823&start_sha=e43441ceee9998e9d3b90222620fbc1ceabb2dd8)
    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: wzw/article!2