• This project
    • Loading...
  • Sign in

fe / YOHOBUYPC · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 2
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !8 opened 2016-12-26 11:26:55 UTC by周少峰@zhoushaofeng

result

Edited 2016-12-26 11:27:44 UTC
Request to merge feature/cartEvent into release/5.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/cartEvent origin/feature/cartEvent

Step 2. Review the changes locally

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

git checkout release/5.3.1
git merge --no-ff feature/cartEvent

Step 4. Push the result of the merge to GitLab

git push origin release/5.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 周少峰 2016-12-26 11:27:44 UTC

The changes were merged into release/5.3.1.

  • Discussion 0
  • Commits 1
  • Changes 5
  • 周少峰
    @zhoushaofeng 2016-12-26 11:27:44 UTC
    Master

    mentioned in commit adeb2ec6

  • 周少峰
    @zhoushaofeng 2016-12-26 11:27:44 UTC
    Master

    Status changed to merged

  • Please register or login to post a comment
8 of 8
Prev Next
周少峰
Assignee
周少峰 @zhoushaofeng
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: fe/YOHOBUYPC!8
×

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.