• 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 !17 opened 2017-08-08 06:27:27 UTC by陈峰@chenfeng163

Feature/vue2.0

Edited 2017-08-08 06:27:32 UTC
Request to merge feature/vue2.0 into release/3.1
×

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/vue2.0 origin/feature/vue2.0

Step 2. Review the changes locally

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

git checkout release/3.1
git merge --no-ff feature/vue2.0

Step 4. Push the result of the merge to GitLab

git push origin release/3.1

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-08-08 06:27:32 UTC

The changes were merged into release/3.1. The source branch has been removed.

  • Discussion 0
  • Commits 8
  • Changes 147
  • 陈峰
    @chenfeng163 2017-08-08 06:27:32 UTC

    Status changed to merged

  • Please register or login to post a comment
17 of 110
Prev Next
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
0
0 participants
Reference: fe/yohoblk-wap!17