• This project
    • Loading...
  • Sign in

fe / yohoblk-wap · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !2 opened 2017-03-03 01:57:20 UTC by姜枫@jiangfeng

Release/2.0

Edited 2017-03-03 02:00:19 UTC
Request to merge release/2.0 into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b release/2.0 origin/release/2.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 release/2.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

Merged by 姜枫 2017-03-03 02:00:19 UTC

The changes were merged into master. The source branch has been removed.

  • Discussion 0
  • Commits 72
  • Changes 120
  • 姜枫
    @jiangfeng 2017-03-03 02:00:07 UTC

    Added 5 commits:

    • 741979f4...446d4bff - 4 commits from branch master
    • e2b02031 - merge from master
  • 姜枫
    @jiangfeng 2017-03-03 02:00:19 UTC

    Status changed to merged

  • 姜枫
    @jiangfeng 2017-03-03 02:00:19 UTC

    mentioned in commit ad1d9254

  • Please register or login to post a comment
2 of 110
Prev Next
姜枫
Assignee
姜枫 @jiangfeng
Assign to
None
Milestone
None
Assign milestone
0
0 participants
Reference: fe/yohoblk-wap!2
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.