• This project
    • Loading...
  • Sign in

fe / yohobuywap-node · 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 !1756 opened 2019-05-17 02:21:10 UTC by黄涛@huangtao

Feature/newfeature

Edited 2019-05-17 06:47:39 UTC
Request to merge feature/newfeature into release/6.9.4
×

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/newfeature origin/feature/newfeature

Step 2. Review the changes locally

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

git checkout release/6.9.4
git merge --no-ff feature/newfeature

Step 4. Push the result of the merge to GitLab

git push origin release/6.9.4

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 陈峰 2019-05-17 06:47:39 UTC

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

  • Discussion 0
  • Commits 16
  • Changes 11
  • 黄涛
    @huangtao 2019-05-17 02:24:06 UTC
    Developer

    Added 4 commits:

    • 921a3704...72d14cca - 3 commits from branch release/6.9.4
    • 6b2f6685 - Merge branch 'master' into feature/newfeature
  • 陈峰
    @chenfeng163 2019-05-17 06:47:39 UTC

    Status changed to merged

  • 陈峰
    @chenfeng163 2019-05-17 06:47:39 UTC

    mentioned in commit 449e16a3

  • Please register or login to post a comment
1756 of 1800
Prev Next
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
0
0 participants
Reference: fe/yohobuywap-node!1756
×

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.