• This project
    • Loading...
  • Sign in

fe / yohobuy-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 1
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !398 opened 2018-12-13 03:44:25 UTC by王水玲@shuiling.wang

Feature/food setting

Edited 2018-12-13 03:44:33 UTC
Request to merge feature/food-setting into release/6.8.3
×

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/food-setting origin/feature/food-setting

Step 2. Review the changes locally

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

git checkout release/6.8.3
git merge --no-ff feature/food-setting

Step 4. Push the result of the merge to GitLab

git push origin release/6.8.3

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 王水玲 2018-12-13 03:44:33 UTC

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

  • Discussion 0
  • Commits 2
  • Changes 2
  • 王水玲
    @shuiling.wang 2018-12-13 03:44:33 UTC

    mentioned in commit 1bb25de1

  • 王水玲
    @shuiling.wang 2018-12-13 03:44:33 UTC

    Status changed to merged

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

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.